w/s fixups

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

diff --git a/includes/Title.php b/includes/Title.php
index a0b36e8..54e2dce 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -76,7 +76,7 @@ class Title {
        # Don't change the following default, NS_MAIN is hardcoded in several
        # places.  See bug 696.
        var $mDefaultNamespace = NS_MAIN; // /< Namespace index when there is no namespace
-                                         # Zero except in {{transclusion}} tags
+                                                                         # Zero except in {{transclusion}} tags
        var $mWatched = null;             // /< Is $wgUser watching this page? null if unfilled, accessed through userIsWatching()
        var $mLength = -1;                // /< The page length, 0 for special pages
        var $mRedirect = null;            // /< Is the article at this title a redirect?
@@ -226,7 +226,7 @@ class Title {
                        return array();
                }
                $dbr = wfGetDB( DB_SLAVE );
-               
+
                $res = $dbr->select(
                        'page',
                        array(
@@ -1427,7 +1427,7 @@ class Title {
 
        /**
         * Check restrictions on cascading pages.
-        * 
+        *
         * @param $action String the action to check
         * @param $user User to check
         * @param $errors Array list of current errors
@@ -1841,7 +1841,7 @@ class Title {
         * cache that we don't need to over-optimize by doing direct comparisons and
         * acidentally creating new bugs where $title->equals( Title::newFromText() )
         * ends up reporting something differently than $title->isMainPage();
-        * 
+        *
         * @return Bool
         */
        public function isMainPage() {
@@ -2004,7 +2004,7 @@ class Title {
        public function userCanEditJsSubpage() {
                global $wgUser;
                return ( ( $wgUser->isAllowed( 'editusercssjs' ) && $wgUser->isAllowed( 'edituserjs' ) )
-                      || preg_match( '/^' . preg_quote( $wgUser->getName(), '/' ) . '\//', $this->mTextform ) );
+                          || preg_match( '/^' . preg_quote( $wgUser->getName(), '/' ) . '\//', $this->mTextform ) );
        }
 
        /**
@@ -2503,6 +2503,7 @@ class Title {
                if ( $this->mInterwiki != '' ) {
                        $p = $this->mInterwiki . ':';
                }
+
                if ( 0 != $this->mNamespace ) {
                        $p .= $this->getNsText() . ':';
                }
@@ -2640,7 +2641,7 @@ class Title {
 
                                        # Redundant interwiki prefix to the local wiki
                                        if ( $wgLocalInterwiki !== false
-                                               && 0 == strcasecmp( $this->mInterwiki, $wgLocalInterwiki ) ) 
+                                               && 0 == strcasecmp( $this->mInterwiki, $wgLocalInterwiki ) )
                                        {
                                                if ( $dbkey == '' ) {
                                                        # Can't have an empty self-link
@@ -2687,13 +2688,13 @@ class Title {
                # reachable due to the way web browsers deal with 'relative' URLs.
                # Also, they conflict with subpage syntax.  Forbid them explicitly.
                if ( strpos( $dbkey, '.' ) !== false &&
-                    ( $dbkey === '.' || $dbkey === '..' ||
-                      strpos( $dbkey, './' ) === 0  ||
-                      strpos( $dbkey, '../' ) === 0 ||
-                      strpos( $dbkey, '/./' ) !== false ||
-                      strpos( $dbkey, '/../' ) !== false  ||
-                      substr( $dbkey, -2 ) == '/.' ||
-                      substr( $dbkey, -3 ) == '/..' ) )
+                        ( $dbkey === '.' || $dbkey === '..' ||
+                          strpos( $dbkey, './' ) === 0  ||
+                          strpos( $dbkey, '../' ) === 0 ||
+                          strpos( $dbkey, '/./' ) !== false ||
+                          strpos( $dbkey, '/../' ) !== false  ||
+                          substr( $dbkey, -2 ) == '/.' ||
+                          substr( $dbkey, -3 ) == '/..' ) )
                {
                        return false;
                }
@@ -2972,7 +2973,7 @@ class Title {
                }
                if ( ( $this->getDBkey() == '' ) ||
                         ( !$oldid ) ||
-                    ( $nt->getDBkey() == '' ) ) {
+                        ( $nt->getDBkey() == '' ) ) {
                        $errors[] = array( 'badarticleerror' );
                }
 
@@ -3092,7 +3093,7 @@ class Title {
                );
                $dbw->update( 'categorylinks',
                        array(
-                               'cl_sortkey' => Collation::singleton()->getSortKey( 
+                               'cl_sortkey' => Collation::singleton()->getSortKey(
                                        $nt->getCategorySortkey( $prefix ) ),
                                'cl_timestamp=cl_timestamp' ),
                        array( 'cl_from' => $pageid ),
@@ -3694,7 +3695,7 @@ class Title {
 
        /**
         * Callback for usort() to do title sorts by (namespace, title)
-        * 
+        *
         * @return Integer: result of string comparison, or namespace comparison
         */
        public static function compare( $a, $b ) {
@@ -3922,8 +3923,8 @@ class Title {
                // Spec: http://www.sixapart.com/pronet/docs/trackback_spec
                return "<!--
 <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"
-         xmlns:dc=\"http://purl.org/dc/elements/1.1/\"
-         xmlns:trackback=\"http://madskills.com/public/xml/rss/module/trackback/\">
+                xmlns:dc=\"http://purl.org/dc/elements/1.1/\"
+                xmlns:trackback=\"http://madskills.com/public/xml/rss/module/trackback/\">
 <rdf:Description
    rdf:about=\"$url\"
    dc:identifier=\"$url\"
@@ -4108,15 +4109,15 @@ class Title {
         */
        public function getRestrictionTypes() {
                global $wgRestrictionTypes;
-               
+
                $types = $this->exists() ? $wgRestrictionTypes : array( 'create' );
 
                if ( $this->getNamespace() != NS_FILE ) {
                        $types = array_diff( $types, array( 'upload' ) );
                }
-               
+
                wfRunHooks( 'TitleGetRestrictionTypes', array( $this, &$types ) );
-               
+
                return $types;
        }