Group public and private properties

Change-Id: I2e399ee311ba44ae9652e75ee210663c3b28614b

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 98e785f..a4194e1 100644 (file)
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -40,6 +40,13 @@ class FileRepo {
        const OVERWRITE_SAME = 4;
        const SKIP_LOCKING = 8;
 
+       /** @var bool Whether to fetch commons image description pages and display
+        *    them on the local wiki */
+       public $fetchDescription;
+
+       /** @var int */
+       public $descriptionCacheExpiry;
+
        /** @var FileBackend */
        protected $backend;
 
@@ -70,10 +77,6 @@ class FileRepo {
        /** @var string Equivalent to $wgArticlePath, e.g. http://en.wikipedia.org/wiki/$1 */
        protected $articleUrl;
 
-       /** @var bool Whether to fetch commons image description pages and display
-        *    them on the local wiki */
-       public $fetchDescription;
-
        /** @var bool Equivalent to $wgCapitalLinks (or $wgCapitalLinkOverrides[NS_FILE],
         *    determines whether filenames implicitly start with a capital letter.
         *    The current implementation may give incorrect description page links
@@ -88,9 +91,6 @@ class FileRepo {
         */
        protected $pathDisclosureProtection = 'simple';
 
-       /** @var int */
-       public $descriptionCacheExpiry;
-
        /** @var bool Public zone URL. */
        protected $url;
 

diff --git a/includes/filerepo/ForeignAPIRepo.php b/includes/filerepo/ForeignAPIRepo.php
index 68846cf..8906834 100644 (file)
--- a/includes/filerepo/ForeignAPIRepo.php
+++ b/includes/filerepo/ForeignAPIRepo.php
@@ -60,10 +60,10 @@ class ForeignAPIRepo extends FileRepo {
        protected $fileCacheExpiry = 2592000;
 
        /** @var array  */
-       private $mQueryCache = array();
+       protected $mFileExists = array();
 
        /** @var array  */
-       protected $mFileExists = array();
+       private $mQueryCache = array();
 
        /**
         * @param $info array|null