Fix variable name in doc comment added in r78192

[lhc/web/wiklou.git] / includes / Title.php

diff --git a/includes/Title.php b/includes/Title.php
index 13ea7d9..9adc9a8 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1304,7 +1304,14 @@ class Title {
 
        /**
         * Check various permission hooks
-        * @see checkQuickPermissions for parameter information
+        *
+        * @param $action String the action to check
+        * @param $user User user to check
+        * @param $errors Array list of current errors
+        * @param $doExpensiveQueries Boolean whether or not to perform expensive queries
+        * @param $short Boolean short circuit on first error
+        *
+        * @return Array list of errors
         */
        private function checkPermissionHooks( $action, $user, $errors, $doExpensiveQueries, $short ) {
                // Use getUserPermissionsErrors instead
@@ -1327,7 +1334,14 @@ class Title {
 
        /**
         * Check permissions on special pages & namespaces
-        * @see checkQuickPermissions for parameter information
+        *
+        * @param $action String the action to check
+        * @param $user User user to check
+        * @param $errors Array list of current errors
+        * @param $doExpensiveQueries Boolean whether or not to perform expensive queries
+        * @param $short Boolean short circuit on first error
+        *
+        * @return Array list of errors
         */
        private function checkSpecialsAndNSPermissions( $action, $user, $errors, $doExpensiveQueries, $short ) {
                # Only 'createaccount' and 'execute' can be performed on
@@ -1350,7 +1364,14 @@ class Title {
 
        /**
         * Check CSS/JS sub-page permissions
-        * @see checkQuickPermissions for parameter information
+        *
+        * @param $action String the action to check
+        * @param $user User user to check
+        * @param $errors Array list of current errors
+        * @param $doExpensiveQueries Boolean whether or not to perform expensive queries
+        * @param $short Boolean short circuit on first error
+        *
+        * @return Array list of errors
         */
        private function checkCSSandJSPermissions( $action, $user, $errors, $doExpensiveQueries, $short ) {
                # Protect css/js subpages of user pages
@@ -1374,7 +1395,14 @@ class Title {
         * Check against page_restrictions table requirements on this
         * page. The user must possess all required rights for this
         * action.
-        * @see checkQuickPermissions for parameter information
+        *
+        * @param $action String the action to check
+        * @param $user User user to check
+        * @param $errors Array list of current errors
+        * @param $doExpensiveQueries Boolean whether or not to perform expensive queries
+        * @param $short Boolean short circuit on first error
+        *
+        * @return Array list of errors
         */
        private function checkPageRestrictions( $action, $user, $errors, $doExpensiveQueries, $short ) {
                foreach ( $this->getRestrictions( $action ) as $right ) {
@@ -1401,7 +1429,14 @@ class Title {
 
        /**
         * Check restrictions on cascading pages.
-        * @see checkQuickPermissions for parameter information
+        * 
+        * @param $action String the action to check
+        * @param $user User user to check
+        * @param $errors Array list of current errors
+        * @param $doExpensiveQueries Boolean whether or not to perform expensive queries
+        * @param $short Boolean short circuit on first error
+        *
+        * @return Array list of errors
         */
        private function checkCascadingSourcesRestrictions( $action, $user, $errors, $doExpensiveQueries, $short ) {
                if ( $doExpensiveQueries && !$this->isCssJsSubpage() ) {
@@ -1433,7 +1468,14 @@ class Title {
 
        /**
         * Check action permissions not already checked in checkQuickPermissions
-        * @see checkQuickPermissions for parameter information
+        *
+        * @param $action String the action to check
+        * @param $user User user to check
+        * @param $errors Array list of current errors
+        * @param $doExpensiveQueries Boolean whether or not to perform expensive queries
+        * @param $short Boolean short circuit on first error
+        *
+        * @return Array list of errors
         */
        private function checkActionPermissions( $action, $user, $errors, $doExpensiveQueries, $short ) {
                if ( $action == 'protect' ) {
@@ -1472,7 +1514,14 @@ class Title {
 
        /**
         * Check that the user isn't blocked from editting.
-        * @see checkQuickPermissions for parameter information
+        *
+        * @param $action String the action to check
+        * @param $user User user to check
+        * @param $errors Array list of current errors
+        * @param $doExpensiveQueries Boolean whether or not to perform expensive queries
+        * @param $short Boolean short circuit on first error
+        *
+        * @return Array list of errors
         */
        private function checkUserBlock( $action, $user, $errors, $doExpensiveQueries, $short ) {
                if( $short && count( $errors ) > 0 ) {
@@ -1898,21 +1947,12 @@ class Title {
 
        /**
         * Is this a *valid* .css or .js subpage of a user page?
-        * Check that the corresponding skin exists
         *
         * @return \type{\bool}
+        * @deprecated
         */
        public function isValidCssJsSubpage() {
-               if ( $this->isCssJsSubpage() ) {
-                       $name = $this->getSkinFromCssJsSubpage();
-                       if ( $name == 'common' ) {
-                               return true;
-                       }
-                       $skinNames = Skin::getSkinNames();
-                       return array_key_exists( $name, $skinNames );
-               } else {
-                       return false;
-               }
+               return $this->isCssJsSubpage();
        }
 
        /**
@@ -2605,7 +2645,9 @@ class Title {
                                        $this->mInterwiki = $wgContLang->lc( $p );
 
                                        # Redundant interwiki prefix to the local wiki
-                                       if ( 0 == strcasecmp( $this->mInterwiki, $wgLocalInterwiki ) ) {
+                                       if ( $wgLocalInterwiki !== false
+                                               && 0 == strcasecmp( $this->mInterwiki, $wgLocalInterwiki ) ) 
+                                       {
                                                if ( $dbkey == '' ) {
                                                        # Can't have an empty self-link
                                                        return false;
@@ -3706,11 +3748,11 @@ class Title {
         */
        public function countRevisionsBetween( $old, $new ) {
                $dbr = wfGetDB( DB_SLAVE );
-               return (int)$dbr->selectField( 'revision', 'count(*)',
-                       'rev_page = ' . intval( $this->getArticleId() ) .
-                       ' AND rev_id > ' . intval( $old ) .
-                       ' AND rev_id < ' . intval( $new ),
-                       __METHOD__
+               return (int)$dbr->selectField( 'revision', 'count(*)', array(
+                               'rev_page' => intval( $this->getArticleId() ),
+                               'rev_id > ' . intval( $old ),
+                               'rev_id < ' . intval( $new )
+                       ), __METHOD__
                );
        }
 
@@ -3728,7 +3770,7 @@ class Title {
                $db = ( $flags & self::GAID_FOR_UPDATE ) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE );
                $res = $db->select( 'revision', 'DISTINCT rev_user_text',
                        array(
-                               'rev_page = ' . $this->getArticleID(),
+                               'rev_page' => $this->getArticleID(),
                                'rev_id > ' . (int)$fromRevId,
                                'rev_id < ' . (int)$toRevId
                        ), __METHOD__,