| Index: trunk/phase3/includes/search/SearchUpdate.php |
| — | — | @@ -15,8 +15,8 @@ |
| 16 | 16 | */ |
| 17 | 17 | class SearchUpdate { |
| 18 | 18 | |
| 19 | | - /* private */ var $mId = 0, $mNamespace, $mTitle, $mText; |
| 20 | | - /* private */ var $mTitleWords; |
| | 19 | + private $mId = 0, $mNamespace, $mTitle, $mText; |
| | 20 | + private $mTitleWords; |
| 21 | 21 | |
| 22 | 22 | function __construct( $id, $title, $text = false ) { |
| 23 | 23 | $nt = Title::newFromText( $title ); |
| Index: trunk/phase3/includes/ImagePage.php |
| — | — | @@ -10,13 +10,10 @@ |
| 11 | 11 | /** |
| 12 | 12 | * @var File |
| 13 | 13 | */ |
| 14 | | - /* private */ var $img; |
| 15 | | - /** |
| 16 | | - * @var File |
| 17 | | - */ |
| 18 | | - /* private */ var $displayImg; |
| 19 | | - /* private */ var $repo; |
| 20 | | - /* private */ var $fileLoaded; |
| | 14 | + private $img; |
| | 15 | + private $displayImg; |
| | 16 | + private $repo; |
| | 17 | + private $fileLoaded; |
| 21 | 18 | |
| 22 | 19 | var $mExtraDescription = false; |
| 23 | 20 | var $dupes; |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -2498,7 +2498,7 @@ |
| 2499 | 2499 | * @return String the prefixed text |
| 2500 | 2500 | * @private |
| 2501 | 2501 | */ |
| 2502 | | - /* private */ function prefix( $name ) { |
| | 2502 | + private function prefix( $name ) { |
| 2503 | 2503 | $p = ''; |
| 2504 | 2504 | if ( $this->mInterwiki != '' ) { |
| 2505 | 2505 | $p = $this->mInterwiki . ':'; |
| Index: trunk/phase3/includes/LinkCache.php |
| — | — | @@ -7,10 +7,10 @@ |
| 8 | 8 | class LinkCache { |
| 9 | 9 | // Increment $mClassVer whenever old serialized versions of this class |
| 10 | 10 | // becomes incompatible with the new version. |
| 11 | | - /* private */ var $mClassVer = 4; |
| | 11 | + private $mClassVer = 4; |
| 12 | 12 | |
| 13 | | - /* private */ var $mGoodLinks, $mBadLinks; |
| 14 | | - /* private */ var $mForUpdate; |
| | 13 | + private $mGoodLinks, $mBadLinks; |
| | 14 | + private $mForUpdate; |
| 15 | 15 | |
| 16 | 16 | /** |
| 17 | 17 | * Get an instance of this class |
| Index: trunk/extensions/DeleteBatch/DeleteBatch.body.php |
| — | — | @@ -310,9 +310,6 @@ |
| 311 | 311 | /* this stuff goes like articleFromTitle in Wiki.php */ |
| 312 | 312 | if ( $page->getNamespace() == NS_FILE ) { |
| 313 | 313 | $art = new ImagePage( $page ); |
| 314 | | - /*this is absolutely required - creating a new ImagePage object does not automatically |
| 315 | | - provide it with image */ |
| 316 | | - $art->img = wfFindFile( $art->mTitle ); |
| 317 | 314 | } else { |
| 318 | 315 | $art = new Article( $page ); |
| 319 | 316 | } |
| Index: trunk/extensions/ReplaceText/SpecialReplaceText.php |
| — | — | @@ -397,7 +397,7 @@ |
| 398 | 398 | foreach ( $titles_for_move as $title ) { |
| 399 | 399 | $wgOut->addHTML( |
| 400 | 400 | Xml::check( 'move-' . $title->getArticleID(), true ) . |
| 401 | | - $skin->makeLinkObj( $title, $title->prefix( $title->getText() ) ) . "<br />\n" |
| | 401 | + $skin->makeLinkObj( $title, $title->getPrefixedText() ) . "<br />\n" |
| 402 | 402 | ); |
| 403 | 403 | } |
| 404 | 404 | $wgOut->addHTML( '<br />' ); |
| Index: trunk/extensions/DynamicPageList/DPLMain.php |
| — | — | @@ -2984,6 +2984,9 @@ |
| 2985 | 2985 | $dplArticle = new DPLArticle( $title, $pageNamespace ); |
| 2986 | 2986 | // Page link |
| 2987 | 2987 | $sTitleText = $title->getText(); |
| | 2988 | + if ( $bShowNamespace ) { |
| | 2989 | + $sTitleText = $title->getPrefixedText(); |
| | 2990 | + } |
| 2988 | 2991 | if ( $aReplaceInTitle[0] != '' ) { |
| 2989 | 2992 | $sTitleText = preg_replace( $aReplaceInTitle[0], $aReplaceInTitle[1], $sTitleText ); |
| 2990 | 2993 | } |
| — | — | @@ -2992,9 +2995,6 @@ |
| 2993 | 2996 | if ( isset( $iTitleMaxLen ) && ( strlen( $sTitleText ) > $iTitleMaxLen ) ) { |
| 2994 | 2997 | $sTitleText = substr( $sTitleText, 0, $iTitleMaxLen ) . '...'; |
| 2995 | 2998 | } |
| 2996 | | - if ( $bShowNamespace ) { |
| 2997 | | - $sTitleText = str_replace( '_', ' ', $title->prefix( $sTitleText ) ); |
| 2998 | | - } |
| 2999 | 2999 | if ( $bShowCurID && isset( $row->page_id ) ) { |
| 3000 | 3000 | $articleLink = '<html>' . $sk->makeKnownLinkObj( $title, htmlspecialchars( $sTitleText ), 'curid=' . $row->page_id ) . '</html>'; |
| 3001 | 3001 | } elseif ( !$bEscapeLinks && ( $pageNamespace == 14 || $pageNamespace == 6 ) ) { |