http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71903

Revision: 71903
Author:   simetrical
Date:     2010-08-29 21:40:27 +0000 (Sun, 29 Aug 2010)

Log Message:
-----------
Make SpecialUpload members public again

These were made protected in r57868 with no explanation, and it broke
extensions.  See bug 24981, which points out that there's no longer any
way for extensions to edit things like $mComment from the
UploadForm:BeforeProcessing hook.

Will backport to 1.16, as a regression from 1.15.

Modified Paths:
--------------
    trunk/phase3/includes/specials/SpecialUpload.php

Modified: trunk/phase3/includes/specials/SpecialUpload.php
===================================================================
--- trunk/phase3/includes/specials/SpecialUpload.php    2010-08-29 21:21:57 UTC 
(rev 71902)
+++ trunk/phase3/includes/specials/SpecialUpload.php    2010-08-29 21:40:27 UTC 
(rev 71903)
@@ -43,29 +43,29 @@
        }
 
        /** Misc variables **/
-       protected $mRequest;                    // The WebRequest or 
FauxRequest this form is supposed to handle
-       protected $mSourceType;
-       protected $mUpload;
-       protected $mLocalFile;
-       protected $mUploadClicked;
+       public $mRequest;                       // The WebRequest or 
FauxRequest this form is supposed to handle
+       public $mSourceType;
+       public $mUpload;
+       public $mLocalFile;
+       public $mUploadClicked;
 
        /** User input variables from the "description" section **/
-       public    $mDesiredDestName;    // The requested target file name
-       protected $mComment;
-       protected $mLicense;
+       public $mDesiredDestName;       // The requested target file name
+       public $mComment;
+       public $mLicense;
 
        /** User input variables from the root section **/
-       protected $mIgnoreWarning;
-       protected $mWatchThis;
-       protected $mCopyrightStatus;
-       protected $mCopyrightSource;
+       public $mIgnoreWarning;
+       public $mWatchThis;
+       public $mCopyrightStatus;
+       public $mCopyrightSource;
 
        /** Hidden variables **/
-       protected $mDestWarningAck;
-       protected $mForReUpload;                // The user followed an 
"overwrite this file" link
-       protected $mCancelUpload;               // The user clicked "Cancel and 
return to upload form" button
-       protected $mTokenOk;
-       protected $mUploadSuccessful = false;   // Subclasses can use this to 
determine whether a file was uploaded
+       public $mDestWarningAck;
+       public $mForReUpload;           // The user followed an "overwrite this 
file" link
+       public $mCancelUpload;          // The user clicked "Cancel and return 
to upload form" button
+       public $mTokenOk;
+       public $mUploadSuccessful = false;      // Subclasses can use this to 
determine whether a file was uploaded
 
        /** Text injection points for hooks not using HTMLForm **/
        public $uploadFormTextTop;



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to