Merge "Add phpdoc and @since to SpecialUserrights::makeGroupNameList"

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 915b93b..e8924ef 100644 (file)
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -259,6 +259,7 @@ HHVM 3.1.
 * OutputPage::getScript() was removed (deprecated since 1.24).
 * OutputPage::out() was removed (deprecated since 1.22).
 * OutputPage::setAllowedModules() was removed (deprecated since 1.24).
+* UserrightsPage::makeGroupNameListForLog() was removed (deprecated since 1.21).
 
 === Languages updated in 1.27 ===
 

diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index a35cb52..be110aa 100644 (file)
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -432,23 +432,6 @@ class UserrightsPage extends SpecialPage {
                }
        }
 
-       /**
-        * Make a list of group names to be stored as parameter for log entries
-        *
-        * @deprecated since 1.21; use LogFormatter instead.
-        * @param array $ids
-        * @return string
-        */
-       function makeGroupNameListForLog( $ids ) {
-               wfDeprecated( __METHOD__, '1.21' );
-
-               if ( empty( $ids ) ) {
-                       return '';
-               } else {
-                       return $this->makeGroupNameList( $ids );
-               }
-       }
-
        /**
         * Output a form to allow searching for a user
         */

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 9d7b294..1185c4d 100644 (file)
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -645,9 +645,6 @@ abstract class UploadBase {
 
                if ( $this->mDesiredDestName != $filename && $comparableName != $filename ) {
                        $warnings['badfilename'] = $filename;
-                       // Debugging for bug 62241
-                       wfDebugLog( 'upload', "Filename: '$filename', mDesiredDestName: "
-                               . "'$this->mDesiredDestName', comparableName: '$comparableName'" );
                }
 
                // Check whether the file extension is on the unwanted list
@@ -666,7 +663,7 @@ abstract class UploadBase {
                }
 
                if ( $this->mFileSize == 0 ) {
-                       $warnings['emptyfile'] = true;
+                       $warnings['empty-file'] = true;
                }
 
                $exists = self::getExistsWarning( $localFile );