Merge "Make the global objects documentation consistent in Setup.php"

[lhc/web/wiklou.git] / includes / gallery / ImageGalleryBase.php

diff --git a/includes/gallery/ImageGalleryBase.php b/includes/gallery/ImageGalleryBase.php
index 42e8c03..8d2b949 100644 (file)
--- a/includes/gallery/ImageGalleryBase.php
+++ b/includes/gallery/ImageGalleryBase.php
@@ -28,30 +28,46 @@
  * @ingroup Media
  */
 abstract class ImageGalleryBase extends ContextSource {
-       /** @var array Gallery images */
-       protected $mImages;
+       /**
+        * @var array Gallery images
+        * @deprecated in 1.23 (was declared "var") and will be removed in 1.24
+        */
+       public $mImages;
 
-       /** @var bool Whether to show the filesize in bytes in categories */
-       protected $mShowBytes;
+       /**
+        * @var bool Whether to show the filesize in bytes in categories
+        * @deprecated in 1.23 (was declared "var") and will be removed in 1.24
+        */
+       public $mShowBytes;
 
-       /** @var bool Whether to show the filename. Default: true */
-       protected $mShowFilename;
+       /**
+        * @var bool Whether to show the filename. Default: true
+        * @deprecated in 1.23 (was declared "var") and will be removed in 1.24
+        */
+       public $mShowFilename;
 
-       /** @var string Gallery mode. Default: traditional */
-       protected $mMode;
+       /**
+        * @var string Gallery mode. Default: traditional
+        * @deprecated in 1.23 (was declared "var") and will be removed in 1.24
+        */
+       public $mMode;
 
-       /** @var bool|string Gallery caption. Default: false */
-       protected $mCaption = false;
+       /**
+        * @var bool|string Gallery caption. Default: false
+        * @deprecated in 1.23 (was declared "var") and will be removed in 1.24
+        */
+       public $mCaption = false;
 
        /**
         * @var bool Hide blacklisted images?
+        * @deprecated in 1.23 (was declared "var") and will be removed in 1.24
         */
-       protected $mHideBadImages;
+       public $mHideBadImages;
 
        /**
         * @var Parser Registered parser object for output callbacks
         */
-       protected $mParser;
+       public $mParser;
 
        /**
         * @var Title Contextual title, used when images are being screened against
@@ -205,17 +221,6 @@ abstract class ImageGalleryBase extends ContextSource {
        public function setAdditionalOptions( $options ) {
        }
 
-       /**
-        * Instruct the class to use a specific skin for rendering
-        *
-        * @param Skin $skin
-        * @deprecated since 1.18 Not used anymore
-        */
-       function useSkin( $skin ) {
-               wfDeprecated( __METHOD__, '1.18' );
-               /* no op */
-       }
-
        /**
         * Add an image to the gallery.
         *