Fix indenting errors introduced in Wikidata branch

Change-Id: I487a0966a26359d4a6769331a6e2ee356eeb41db

diff --git a/includes/Article.php b/includes/Article.php
index 7c76806..0c32e19 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -250,9 +250,9 @@ class Article extends Page {
 
        /**
         * Returns a Content object representing the pages effective display content,
-     * not necessarily the revision's content!
-     *
-     * Note that getContent/loadContent do not follow redirects anymore.
+        * not necessarily the revision's content!
+        *
+        * Note that getContent/loadContent do not follow redirects anymore.
         * If you need to fetch redirectable content easily, try
         * the shortcut in WikiPage::getRedirectTarget()
         *

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index e8e0b93..0fee7c1 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -280,18 +280,18 @@ $wgAutoloadLocalClasses = array(
        'ZhClient' => 'includes/ZhClient.php',
        'ZipDirectoryReader' => 'includes/ZipDirectoryReader.php',
 
-    # content handler
-    'Content' => 'includes/Content.php',
-    'AbstractContent' => 'includes/Content.php',
-    'ContentHandler' => 'includes/ContentHandler.php',
-    'CssContent' => 'includes/Content.php',
-    'CssContentHandler' => 'includes/ContentHandler.php',
-    'JavaScriptContent' => 'includes/Content.php',
-    'JavaScriptContentHandler' => 'includes/ContentHandler.php',
-    'MessageContent' => 'includes/Content.php',
-    'TextContent' => 'includes/Content.php',
-    'WikitextContent' => 'includes/Content.php',
-    'WikitextContentHandler' => 'includes/ContentHandler.php',
+       # content handler
+       'Content' => 'includes/Content.php',
+       'AbstractContent' => 'includes/Content.php',
+       'ContentHandler' => 'includes/ContentHandler.php',
+       'CssContent' => 'includes/Content.php',
+       'CssContentHandler' => 'includes/ContentHandler.php',
+       'JavaScriptContent' => 'includes/Content.php',
+       'JavaScriptContentHandler' => 'includes/ContentHandler.php',
+       'MessageContent' => 'includes/Content.php',
+       'TextContent' => 'includes/Content.php',
+       'WikitextContent' => 'includes/Content.php',
+       'WikitextContentHandler' => 'includes/ContentHandler.php',
 
        # includes/actions
        'CachedAction' => 'includes/actions/CachedAction.php',
@@ -335,7 +335,7 @@ $wgAutoloadLocalClasses = array(
        'ApiFormatDump' => 'includes/api/ApiFormatDump.php',
        'ApiFormatFeedWrapper' => 'includes/api/ApiFormatBase.php',
        'ApiFormatJson' => 'includes/api/ApiFormatJson.php',
-        'ApiFormatNone' => 'includes/api/ApiFormatNone.php',
+       'ApiFormatNone' => 'includes/api/ApiFormatNone.php',
        'ApiFormatPhp' => 'includes/api/ApiFormatPhp.php',
        'ApiFormatRaw' => 'includes/api/ApiFormatRaw.php',
        'ApiFormatTxt' => 'includes/api/ApiFormatTxt.php',

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9bc0fd2..41bb970 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -674,10 +674,10 @@ $wgMediaHandlers = array(
  * Each entry in the array maps a model id to a class name
  */
 $wgContentHandlers = array(
-    CONTENT_MODEL_WIKITEXT => 'WikitextContentHandler', // the usual case
-    CONTENT_MODEL_JAVASCRIPT => 'JavaScriptContentHandler', // dumb version, no syntax highlighting
-    CONTENT_MODEL_CSS => 'CssContentHandler', // dumb version, no syntax highlighting
-    CONTENT_MODEL_TEXT => 'TextContentHandler', // dumb plain text in <pre>
+       CONTENT_MODEL_WIKITEXT => 'WikitextContentHandler', // the usual case
+       CONTENT_MODEL_JAVASCRIPT => 'JavaScriptContentHandler', // dumb version, no syntax highlighting
+       CONTENT_MODEL_CSS => 'CssContentHandler', // dumb version, no syntax highlighting
+       CONTENT_MODEL_TEXT => 'TextContentHandler', // dumb plain text in <pre>
 );
 
 /**

diff --git a/includes/DeprecatedGlobal.php b/includes/DeprecatedGlobal.php
index 4d7b968..d48bd0b 100644 (file)
--- a/includes/DeprecatedGlobal.php
+++ b/includes/DeprecatedGlobal.php
@@ -27,7 +27,7 @@
  */
 
 class DeprecatedGlobal extends StubObject {
-        // The m's are to stay consistent with parent class.
+       // The m's are to stay consistent with parent class.
        protected $mRealValue, $mVersion;
 
        function __construct( $name, $realValue, $version = false ) {

diff --git a/includes/FeedUtils.php b/includes/FeedUtils.php
index a094255..d60d5c8 100644 (file)
--- a/includes/FeedUtils.php
+++ b/includes/FeedUtils.php
@@ -138,8 +138,8 @@ class FeedUtils {
                        $diffText = '';
                        // Don't bother generating the diff if we won't be able to show it
                        if ( $wgFeedDiffCutoff > 0 ) {
-                $contentHandler = ContentHandler::getForTitle( $title );
-                $de = $contentHandler->createDifferenceEngine( $title, $oldid, $newid );
+                               $contentHandler = ContentHandler::getForTitle( $title );
+                               $de = $contentHandler->createDifferenceEngine( $title, $oldid, $newid );
                                $diffText = $de->getDiff(
                                        wfMsg( 'previousrevision' ), // hack
                                        wfMsg( 'revisionasof',

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 6fd253a..62fdcca 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -270,20 +270,20 @@ class ImagePage extends Article {
                return $r;
        }
 
-    /**
-     * Overloading Article's getContentObject method.
-     *
-     * Omit noarticletext if sharedupload; text will be fetched from the
-     * shared upload server if possible.
-     * @return string
-     */
-    public function getContentObject() {
-        $this->loadFile();
-        if ( $this->mPage->getFile() && !$this->mPage->getFile()->isLocal() && 0 == $this->getID() ) {
-            return null;
-        }
-        return parent::getContentObject();
-    }
+       /**
+        * Overloading Article's getContentObject method.
+        *
+        * Omit noarticletext if sharedupload; text will be fetched from the
+        * shared upload server if possible.
+        * @return string
+        */
+       public function getContentObject() {
+               $this->loadFile();
+               if ( $this->mPage->getFile() && !$this->mPage->getFile()->isLocal() && 0 == $this->getID() ) {
+                       return null;
+               }
+               return parent::getContentObject();
+       }
 
        protected function openShowImage() {
                global $wgImageLimits, $wgEnableUploads, $wgSend404Code;

diff --git a/includes/actions/RollbackAction.php b/includes/actions/RollbackAction.php
index 5c85d53..5ee6786 100644 (file)
--- a/includes/actions/RollbackAction.php
+++ b/includes/actions/RollbackAction.php
@@ -109,8 +109,8 @@ class RollbackAction extends FormlessAction {
                $this->getOutput()->returnToMain( false, $this->getTitle() );
 
                if ( !$request->getBool( 'hidediff', false ) && !$this->getUser()->getBoolOption( 'norollbackdiff', false ) ) {
-            $contentHandler = ContentHandler::getForTitle( $this->getTitle() );
-            $de = $contentHandler->createDifferenceEngine( $this->getContext(), $current->getId(), $newId, false, true );
+                       $contentHandler = ContentHandler::getForTitle( $this->getTitle() );
+                       $de = $contentHandler->createDifferenceEngine( $this->getContext(), $current->getId(), $newId, false, true );
                        $de->showDiff( '', '' );
                }
        }

diff --git a/includes/api/ApiComparePages.php b/includes/api/ApiComparePages.php
index 5106527..0808521 100644 (file)
--- a/includes/api/ApiComparePages.php
+++ b/includes/api/ApiComparePages.php
@@ -35,8 +35,8 @@ class ApiComparePages extends ApiBase {
                $rev1 = $this->revisionOrTitleOrId( $params['fromrev'], $params['fromtitle'], $params['fromid'] );
                $rev2 = $this->revisionOrTitleOrId( $params['torev'], $params['totitle'], $params['toid'] );
 
-        $contentHandler = ContentHandler::getForModelID( $rev1->getContentModel() );
-        $de = $contentHandler->createDifferenceEngine( $this->getContext(),
+               $contentHandler = ContentHandler::getForModelID( $rev1->getContentModel() );
+               $de = $contentHandler->createDifferenceEngine( $this->getContext(),
                        $rev1,
                        $rev2,
                        null, // rcid

diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index d445d68..814f0d4 100644 (file)
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -119,8 +119,8 @@ class ApiEditPage extends ApiBase {
                        if ( !is_null( $params['section'] ) ) {
                                // Process the content for section edits
                                $section = intval( $params['section'] );
-                $sectionContent = $content->getSection( $section );
-                $text = ContentHandler::getContentText( $sectionContent ); #FIXME: serialize?! get format from params?...
+                               $sectionContent = $content->getSection( $section );
+                               $text = ContentHandler::getContentText( $sectionContent ); #FIXME: serialize?! get format from params?...
                                if ( $text === false || $text === null ) {
                                        $this->dieUsage( "There is no section {$section}.", 'nosuchsection' );
                                }
@@ -242,7 +242,7 @@ class ApiEditPage extends ApiBase {
                // TODO: Make them not or check if they still do
                $wgTitle = $titleObj;
 
-        $handler = ContentHandler::getForTitle( $titleObj );
+               $handler = ContentHandler::getForTitle( $titleObj );
                $ep = $handler->createEditPage( $articleObj );
 
                $ep->setContextTitle( $titleObj );

diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index 72808e0..9cbaf3f 100644 (file)
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -336,7 +336,7 @@ class ApiParse extends ApiBase {
                                $this->dieUsage( "There is no revision ID {$page->getLatest()}", 'missingrev' );
                        }
                        if ( $getWikitext ) {
-                $this->content = $page->getContent( Revision::RAW ); #FIXME: use $this->content everywhere
+                               $this->content = $page->getContent( Revision::RAW ); #FIXME: use $this->content everywhere
                                $this->text = ContentHandler::getContentText( $this->content ); #FIXME: serialize, get format from params; or use object structure in result?
                        }
                        return $pout;

diff --git a/includes/specials/SpecialComparePages.php b/includes/specials/SpecialComparePages.php
index ecc0b83..565bfda 100644 (file)
--- a/includes/specials/SpecialComparePages.php
+++ b/includes/specials/SpecialComparePages.php
@@ -111,7 +111,7 @@ class SpecialComparePages extends SpecialPage {
                $rev2 = self::revOrTitle( $data['Revision2'], $data['Page2'] );
 
                if( $rev1 && $rev2 ) {
-            $contentHandler = ContentHandler::getForModelID( $rev1->getContentModel() );
+                       $contentHandler = ContentHandler::getForModelID( $rev1->getContentModel() );
                        $de = $contentHandler->createDifferenceEngine( $form->getContext(),
                                $rev1,
                                $rev2,