(bug 28583) chase down and beat to death external calls of functions marked /*private...

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index cdaac24..ad3a5a7 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -10,13 +10,10 @@ class ImagePage extends Article {
        /**
         * @var File
         */
-       /* private */ var $img;
-       /**
-        * @var File
-        */
-       /* private */ var $displayImg;
-       /* private */ var $repo;
-       /* private */ var $fileLoaded;
+       private $img;
+       private $displayImg;
+       private $repo;
+       private $fileLoaded;
 
        var $mExtraDescription = false;
        var $dupes;

diff --git a/includes/LinkCache.php b/includes/LinkCache.php
index e2db69a..f3dea93 100644 (file)
--- a/includes/LinkCache.php
+++ b/includes/LinkCache.php
@@ -7,10 +7,10 @@
 class LinkCache {
        // Increment $mClassVer whenever old serialized versions of this class
        // becomes incompatible with the new version.
-       /* private */ var $mClassVer = 4;
+       private $mClassVer = 4;
 
-       /* private */ var $mGoodLinks, $mBadLinks;
-       /* private */ var $mForUpdate;
+       private $mGoodLinks, $mBadLinks;
+       private $mForUpdate;
 
        /**
         * Get an instance of this class

diff --git a/includes/Title.php b/includes/Title.php
index bb6cd0a..78af3b0 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2498,7 +2498,7 @@ class Title {
         * @return String the prefixed text
         * @private
         */
-       /* private */ function prefix( $name ) {
+       private function prefix( $name ) {
                $p = '';
                if ( $this->mInterwiki != '' ) {
                        $p = $this->mInterwiki . ':';

diff --git a/includes/search/SearchUpdate.php b/includes/search/SearchUpdate.php
index 5262faa..77146eb 100644 (file)
--- a/includes/search/SearchUpdate.php
+++ b/includes/search/SearchUpdate.php
@@ -15,8 +15,8 @@
  */
 class SearchUpdate {
 
-       /* private */ var $mId = 0, $mNamespace, $mTitle, $mText;
-       /* private */ var $mTitleWords;
+       private $mId = 0, $mNamespace, $mTitle, $mText;
+       private $mTitleWords;
 
        function __construct( $id, $title, $text = false ) {
                $nt = Title::newFromText( $title );