* Fix comment in Title::getUserPermissionsErrors() and Title::getUserPermissionsError...

* Remove unused global declaration of $wgUser in Title::getUserPermissionsErrors()

diff --git a/includes/Title.php b/includes/Title.php
index 6f94c88..ea2b197 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1037,6 +1037,7 @@ class Title {
         * FIXME: This *does not* check throttles (User::pingLimiter()).
         *
         * @param string $action action that permission needs to be checked for
+        * @param User $user user to check
         * @param bool $doExpensiveQueries Set this to false to avoid doing unnecessary queries.
         * @return array Array of arrays of the arguments to wfMsg to explain permissions problems.
         */
@@ -1045,7 +1046,7 @@ class Title {
 
                global $wgContLang;
                global $wgLang;
-               global $wgEmailConfirmToEdit, $wgUser;
+               global $wgEmailConfirmToEdit;
 
                if ( $wgEmailConfirmToEdit && !$user->isEmailConfirmed() ) {
                        $errors[] = array( 'confirmedittext' );
@@ -1108,6 +1109,7 @@ class Title {
         * checks on wfReadOnly() and blocks)
         *
         * @param string $action action that permission needs to be checked for
+        * @param User $user user to check
         * @param bool $doExpensiveQueries Set this to false to avoid doing unnecessary queries.
         * @return array Array of arrays of the arguments to wfMsg to explain permissions problems.
         */