| Index: trunk/extensions/WikiForum/WikiForumClass.php |
| — | — | @@ -2341,8 +2341,8 @@ |
| 2342 | 2342 | |
| 2343 | 2343 | if( $username ) { |
| 2344 | 2344 | $sk = $wgUser->getSkin(); |
| 2345 | | - $retVal = $sk->makeLink( |
| 2346 | | - $wgContLang->getNsText( NS_USER ) . ':' . $username, |
| | 2345 | + $retVal = $sk->makeLinkObj( |
| | 2346 | + Title::newFromText( $wgContLang->getNsText( NS_USER ) . ':' . $username ), |
| 2347 | 2347 | htmlspecialchars( $username ) |
| 2348 | 2348 | ); |
| 2349 | 2349 | |
| Index: trunk/extensions/TalkHere/TalkHere.php |
| — | — | @@ -47,7 +47,7 @@ |
| 48 | 48 | $html = $out->getHTML(); |
| 49 | 49 | |
| 50 | 50 | if ( $returnto ) { //re-target cancel link |
| 51 | | - $cancel = $sk->makeLink( $returnto, wfMsgExt('cancel', array('parseinline')) ); |
| | 51 | + $cancel = $sk->makeLinkObj( Title::newFromText( $returnto ), wfMsgExt('cancel', array( 'parseinline' ) ) ); |
| 52 | 52 | $html = preg_replace( '!<a[^<>]+>[^<>]+</a>( *\| *<a target=["\']helpwindow["\'])!smi', $cancel . '\1', $html ); |
| 53 | 53 | } |
| 54 | 54 | else { |
| Index: trunk/extensions/Wikidata/OmegaWiki/Editor.php |
| — | — | @@ -2107,7 +2107,7 @@ |
| 2108 | 2108 | $wgUser; |
| 2109 | 2109 | |
| 2110 | 2110 | if ( $value != "" ) |
| 2111 | | - return $wgUser->getSkin()->makeLink( "User:" . $value, $value ); |
| | 2111 | + return $wgUser->getSkin()->makeLinkObj( Title::newFromText( "User:" . $value ), $value ); |
| 2112 | 2112 | else |
| 2113 | 2113 | return ""; |
| 2114 | 2114 | } |
| Index: trunk/extensions/MetavidWiki/includes/MV_ImageGallery.php |
| — | — | @@ -1,10 +1,10 @@ |
| 2 | 2 | <?php |
| 3 | 3 | /* |
| 4 | 4 | * MV_ImageGallery.php Created on Oct 22, 2007 |
| 5 | | - * |
| | 5 | + * |
| 6 | 6 | * All Metavid Wiki code is Released Under the GPL2 |
| 7 | 7 | * for more info visit http://metavid.org/wiki/Code |
| 8 | | - * |
| | 8 | + * |
| 9 | 9 | * @author Michael Dale |
| 10 | 10 | * @email dale@ucsc.edu |
| 11 | 11 | * @url http://metavid.org |
| — | — | @@ -37,20 +37,19 @@ |
| 38 | 38 | foreach ( $this->mImages as $pair ) { |
| 39 | 39 | $nt = $pair[0]; |
| 40 | 40 | $text = $pair[1]; |
| 41 | | - |
| | 41 | + |
| 42 | 42 | # Give extensions a chance to select the file revision for us |
| 43 | 43 | $time = false; |
| 44 | 44 | wfRunHooks( 'BeforeGalleryFindFile', array( &$this, &$nt, &$time ) ); |
| 45 | 45 | |
| 46 | 46 | $img = wfFindFile( $nt, array( 'time' => $time ) ); |
| 47 | | - |
| 48 | | - |
| | 47 | + |
| 49 | 48 | if ( $nt->getNamespace() == MV_NS_MVD || |
| 50 | 49 | $nt->getNamespace() == MV_NS_STREAM || |
| 51 | 50 | $nt->getNamespace() == MV_NS_SEQUENCE ) { // @@todo fix sequence embed |
| 52 | | - // $vpad = floor( ( 1.25*$this->mHeights - $thumb->height ) /2 ) - 2; |
| | 51 | + // $vpad = floor( ( 1.25*$this->mHeights - $thumb->height ) /2 ) - 2; |
| 53 | 52 | $mvTitle = new MV_Title( $nt ); |
| 54 | | - |
| | 53 | + |
| 55 | 54 | // remap MVD namespace links into the Stream view (so contextual metadata is present) |
| 56 | 55 | if ( $nt->getNamespace() == MV_NS_MVD ) { |
| 57 | 56 | $nt = Title::MakeTitle( MV_NS_STREAM, ucfirst( $mvTitle->getStreamName() ) . '/' . $mvTitle->getTimeRequest() ); |
| — | — | @@ -62,7 +61,7 @@ |
| 63 | 62 | '<div class="thumb" style="padding: 4px 0; width: ' . htmlspecialchars( $this->mWidths + 5 ) . 'px;">' |
| 64 | 63 | # Auto-margin centering for block-level elements. Needed now that we have video |
| 65 | 64 | # handlers since they may emit block-level elements as opposed to simple <img> tags. |
| 66 | | - # ref http://css-discuss.incutio.com/?page=CenteringBlockElement |
| | 65 | + # ref http://css-discuss.incutio.com/?page=CenteringBlockElement |
| 67 | 66 | . '<div style="margin-left: auto; margin-right: auto; width: ' . htmlspecialchars( $this->mWidths ) . 'px;">' |
| 68 | 67 | . $sk->makeKnownLinkObj( $nt, '<img title="'. htmlspecialchars($mvTitle->getStreamNameText()) .'"' |
| 69 | 68 | . ' width="160" height="120" src="'.$mvTitle->getStreamImageURL('160x120') . '">') |
| — | — | @@ -76,7 +75,7 @@ |
| 77 | 76 | $nb = ''; |
| 78 | 77 | $textlink = ''; |
| 79 | 78 | } else { |
| 80 | | - |
| | 79 | + |
| 81 | 80 | if ( $nt->getNamespace() != NS_IMAGE || !$img ) { |
| 82 | 81 | # We're dealing with a non-image, spit out the name and be done with it. |
| 83 | 82 | $thumbhtml = "\n\t\t\t" . '<div style="height: ' . ( $this->mHeights * 1.25 + 2 ) . 'px;">' |
| — | — | @@ -91,7 +90,7 @@ |
| 92 | 91 | . htmlspecialchars( $img->getLastError() ) . '</div>'; |
| 93 | 92 | } else { |
| 94 | 93 | $vpad = floor( ( 1.25 * $this->mHeights - $thumb->height ) / 2 ) - 2; |
| 95 | | - |
| | 94 | + |
| 96 | 95 | $thumbhtml = "\n\t\t\t" . |
| 97 | 96 | '<div class="thumb" style="padding: ' . htmlspecialchars( $vpad ) . 'px 0; width: ' . htmlspecialchars( $this->mWidths + 30 ) . 'px;">' |
| 98 | 97 | # Auto-margin centering for block-level elements. Needed now that we have video |
| — | — | @@ -99,15 +98,12 @@ |
| 100 | 99 | # ref http://css-discuss.incutio.com/?page=CenteringBlockElement |
| 101 | 100 | . '<div style="margin-left: auto; margin-right: auto; width: ' . htmlspecialchars( $this->mWidths ) . 'px;">' |
| 102 | 101 | . $thumb->toHtml( array( 'desc-link' => true ) ) . '</div></div>'; |
| 103 | | - |
| | 102 | + |
| 104 | 103 | // Call parser transform hook |
| 105 | 104 | if ( $this->mParser && $img->getHandler() ) { |
| 106 | 105 | $img->getHandler()->parserTransformHook( $this->mParser, $img ); |
| 107 | 106 | } |
| 108 | 107 | } |
| 109 | | - |
| 110 | | - // TODO |
| 111 | | - // $ul = $sk->makeLink( $wgContLang->getNsText( MWNamespace::getUser() ) . ":{$ut}", $ut ); |
| 112 | 108 | |
| 113 | 109 | if ( $this->mShowBytes ) { |
| 114 | 110 | if ( $img ) { |
| — | — | @@ -120,7 +116,7 @@ |
| 121 | 117 | } else { |
| 122 | 118 | $nb = ''; |
| 123 | 119 | } |
| 124 | | - |
| | 120 | + |
| 125 | 121 | $textlink = $this->mShowFilename ? |
| 126 | 122 | $sk->makeKnownLinkObj( $nt, htmlspecialchars( $wgLang->truncate( $nt->getText(), 20 ) ) ) . "<br />\n" : |
| 127 | 123 | '' ; |
| Index: trunk/extensions/ImageTagging/ImageTagging_body.php |
| — | — | @@ -1,6 +1,6 @@ |
| 2 | 2 | <?php |
| 3 | 3 | /** |
| 4 | | - * TaggedImages class |
| | 4 | + * TaggedImages class |
| 5 | 5 | * |
| 6 | 6 | * @file |
| 7 | 7 | * @ingroup Extensions |
| — | — | @@ -235,7 +235,7 @@ |
| 236 | 236 | * - the size of the image |
| 237 | 237 | */ |
| 238 | 238 | function toHTML() { |
| 239 | | - global $wgLang, $wgUser, $wgOut; |
| | 239 | + global $wgLang, $wgUser; |
| 240 | 240 | |
| 241 | 241 | $sk = $wgUser->getSkin(); |
| 242 | 242 | |
| — | — | @@ -261,9 +261,6 @@ |
| 262 | 262 | continue; |
| 263 | 263 | } |
| 264 | 264 | |
| 265 | | - // TODO - getUser() doesn't exist, do you mean NS_USER? |
| 266 | | - // $ul = $sk->makeLink( $wgContLang->getNsText( MWNamespace::getUser() ) . ":{$ut}", $ut ); |
| 267 | | - |
| 268 | 265 | $nb = ''; |
| 269 | 266 | $textlink = $this->mShowFilename ? |
| 270 | 267 | $sk->makeKnownLinkObj( $nt, htmlspecialchars( $wgLang->truncate( $nt->getText(), 20 ) ) ) . "<br />\n" : |
| Index: trunk/extensions/Asksql/Asksql_body.php |
| — | — | @@ -13,8 +13,8 @@ |
| 14 | 14 | function execute( $par ) { |
| 15 | 15 | global $wgAllowSysopQueries, $wgUser, $wgRequest, $wgOut; |
| 16 | 16 | |
| 17 | | - |
| 18 | 17 | |
| | 18 | + |
| 19 | 19 | if ( !$wgAllowSysopQueries ) { |
| 20 | 20 | throw new ErrorPageError( 'nosuchspecialpage', 'nospecialpagetext' ); |
| 21 | 21 | } |
| — | — | @@ -141,8 +141,9 @@ |
| 142 | 142 | } else { |
| 143 | 143 | $link = "$sTitle"; |
| 144 | 144 | } |
| | 145 | + $title = Title::newFromText( $link ); |
| 145 | 146 | $skin = $wgUser->getSkin(); |
| 146 | | - $link = $skin->makeLink( $link ); |
| | 147 | + $link = $skin->makeLinkObj( $title ); |
| 147 | 148 | $r .= "* [[$link]]<br />\n"; |
| 148 | 149 | } |
| 149 | 150 | } else { |