From: umherirrender Date: Sat, 9 Feb 2013 21:44:24 +0000 (+0100) Subject: remove space before semicolon X-Git-Tag: 1.31.0-rc.0~20732^2 X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=f3cf109e6296bad26a11beebd59abb355384d051;p=lhc%2Fweb%2Fwiklou.git remove space before semicolon Change-Id: Ic0d890f5e27cec017c7f7910a67d53b2edf82079 --- diff --git a/includes/Article.php b/includes/Article.php index 2b7e9a508b..1dc27a7221 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -420,7 +420,7 @@ class Article implements Page { # Pre-fill content with error message so that if something # fails we'll have something telling us what we intended. //XXX: this isn't page content but a UI message. horrible. - $this->mContentObject = new MessageContent( 'missing-revision', array( $oldid ), array() ) ; + $this->mContentObject = new MessageContent( 'missing-revision', array( $oldid ), array() ); if ( $oldid ) { # $this->mRevision might already be fetched by getOldIDFromRequest() @@ -1268,7 +1268,7 @@ class Article implements Page { 'oldid' => $oldid ) + $extraParams ); - $prev = $this->getTitle()->getPreviousRevisionID( $oldid ) ; + $prev = $this->getTitle()->getPreviousRevisionID( $oldid ); $prevlink = $prev ? Linker::linkKnown( $this->getTitle(), diff --git a/includes/EditPage.php b/includes/EditPage.php index 80c091e9b2..fd63e9910b 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -2960,13 +2960,13 @@ HTML if ( $this->mTriedSave && !$this->mTokenOk ) { if ( $this->mTokenOkExceptSuffix ) { - $note = wfMessage( 'token_suffix_mismatch' )->plain() ; + $note = wfMessage( 'token_suffix_mismatch' )->plain(); } else { - $note = wfMessage( 'session_fail_preview' )->plain() ; + $note = wfMessage( 'session_fail_preview' )->plain(); } } elseif ( $this->incompleteForm ) { - $note = wfMessage( 'edit_form_incomplete' )->plain() ; + $note = wfMessage( 'edit_form_incomplete' )->plain(); } else { $note = wfMessage( 'previewnote' )->plain() . ' [[#' . self::EDITFORM_ID . '|' . $wgLang->getArrow() . ' ' . wfMessage( 'continue-editing' )->text() . ']]'; diff --git a/includes/Export.php b/includes/Export.php index eea1988052..8f767cb0fb 100644 --- a/includes/Export.php +++ b/includes/Export.php @@ -31,8 +31,8 @@ * @ingroup SpecialPage Dump */ class WikiExporter { - var $list_authors = false ; # Return distinct author list (when not returning full history) - var $author_list = "" ; + var $list_authors = false; # Return distinct author list (when not returning full history) + var $author_list = ""; var $dumpUploads = false; var $dumpUploadFileContents = false; diff --git a/includes/FeedUtils.php b/includes/FeedUtils.php index 66f627513d..bc12fbc42c 100644 --- a/includes/FeedUtils.php +++ b/includes/FeedUtils.php @@ -222,7 +222,7 @@ class FeedUtils { protected static function getDiffLink( Title $title, $newid, $oldid = null ) { $queryParameters = ($oldid == null) ? "diff={$newid}" - : "diff={$newid}&oldid={$oldid}" ; + : "diff={$newid}&oldid={$oldid}"; $diffUrl = $title->getFullUrl( $queryParameters ); $diffLink = Html::element( 'a', array( 'href' => $diffUrl ), diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php index 9e9f0dae0b..6a348a630d 100644 --- a/includes/HttpFunctions.php +++ b/includes/HttpFunctions.php @@ -338,7 +338,7 @@ class MWHttpRequest { if ( Http::isLocalURL( $this->url ) || $this->noProxy ) { $this->proxy = ''; } elseif ( $wgHTTPProxy ) { - $this->proxy = $wgHTTPProxy ; + $this->proxy = $wgHTTPProxy; } elseif ( getenv( "http_proxy" ) ) { $this->proxy = getenv( "http_proxy" ); } diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php index 91c3190fc3..8247092f1c 100644 --- a/includes/ImageGallery.php +++ b/includes/ImageGallery.php @@ -354,7 +354,7 @@ class ImageGallery { array(), array( 'known', 'noclasses' ) ) . "
\n" : - '' ; + ''; # ATTENTION: The newline after
is needed to accommodate htmltidy which # in version 4.8.6 generated crackpot html in its absence, see: diff --git a/includes/Preferences.php b/includes/Preferences.php index 1e4f85f807..76e1760b40 100644 --- a/includes/Preferences.php +++ b/includes/Preferences.php @@ -359,7 +359,7 @@ class Preferences { if ( $wgEnableEmail ) { $helpMessages[] = $wgEmailConfirmToEdit ? 'prefs-help-email-required' - : 'prefs-help-email' ; + : 'prefs-help-email'; if( $wgEnableUserEmail ) { // additional messages when users can send email to each other diff --git a/includes/RecentChange.php b/includes/RecentChange.php index 047042697c..f63e95cc42 100644 --- a/includes/RecentChange.php +++ b/includes/RecentChange.php @@ -80,7 +80,7 @@ class RecentChange { * @var Title */ var $mMovedToTitle = false; - var $numberofWatchingusers = 0 ; # Dummy to prevent error message in SpecialRecentchangeslinked + var $numberofWatchingusers = 0; # Dummy to prevent error message in SpecialRecentchangeslinked var $notificationtimestamp; # Factory methods @@ -712,7 +712,7 @@ class RecentChange { $trail = "curid=" . (int)( $this->mAttribs['rc_cur_id'] ) . "&oldid=" . (int)( $this->mAttribs['rc_last_oldid'] ); if ( $forceCur ) { - $trail .= '&diff=0' ; + $trail .= '&diff=0'; } else { $trail .= '&diff=' . (int)( $this->mAttribs['rc_this_oldid'] ); } @@ -761,10 +761,10 @@ class RecentChange { if ( $szdiff < -500 ) { $szdiff = "\002$szdiff\002"; } elseif ( $szdiff >= 0 ) { - $szdiff = '+' . $szdiff ; + $szdiff = '+' . $szdiff; } // @todo i18n with parentheses in content language? - $szdiff = '(' . $szdiff . ')' ; + $szdiff = '(' . $szdiff . ')'; } else { $szdiff = ''; } diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php index cf6c10610f..ff1007c96b 100644 --- a/includes/Sanitizer.php +++ b/includes/Sanitizer.php @@ -1736,8 +1736,8 @@ class Sanitizer { // Please note strings below are enclosed in brackets [], this make the // hyphen "-" a range indicator. Hence it is double backslashed below. // See bug 26948 - $rfc5322_atext = "a-z0-9!#$%&'*+\\-\/=?^_`{|}~" ; - $rfc1034_ldh_str = "a-z0-9\\-" ; + $rfc5322_atext = "a-z0-9!#$%&'*+\\-\/=?^_`{|}~"; + $rfc1034_ldh_str = "a-z0-9\\-"; $HTML5_email_regexp = "/ ^ # start of string @@ -1746,7 +1746,7 @@ class Sanitizer { [$rfc1034_ldh_str]+ # First domain part (\\.[$rfc1034_ldh_str]+)* # Following part prefixed with a dot $ # End of string - /ix" ; // case Insensitive, eXtended + /ix"; // case Insensitive, eXtended return (bool) preg_match( $HTML5_email_regexp, $addr ); } diff --git a/includes/Setup.php b/includes/Setup.php index 273d75bca9..7f4d6342e9 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -65,7 +65,7 @@ if ( !empty( $wgActionPaths ) && !isset( $wgActionPaths['view'] ) ) { if ( !empty( $wgActionPaths ) && !isset( $wgActionPaths['view'] ) ) { # 'view' is assumed the default action path everywhere in the code # but is rarely filled in $wgActionPaths - $wgActionPaths['view'] = $wgArticlePath ; + $wgActionPaths['view'] = $wgArticlePath; } if ( $wgStylePath === false ) $wgStylePath = "$wgScriptPath/skins"; diff --git a/includes/Title.php b/includes/Title.php index 957af2bf1a..593e5786fa 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -149,7 +149,7 @@ class Title { $t->mDbkeyform = str_replace( ' ', '_', $filteredText ); $t->mDefaultNamespace = $defaultNamespace; - static $cachedcount = 0 ; + static $cachedcount = 0; if ( $t->secureAndSplit() ) { if ( $defaultNamespace == NS_MAIN ) { if ( $cachedcount >= self::CACHE_MAX ) { diff --git a/includes/actions/RawAction.php b/includes/actions/RawAction.php index 71cb397dd7..da6ba1e65a 100644 --- a/includes/actions/RawAction.php +++ b/includes/actions/RawAction.php @@ -204,7 +204,7 @@ class RawAction extends FormlessAction { $oldid = $this->page->getLatest(); } $prev = $this->getTitle()->getPreviousRevisionId( $oldid ); - $oldid = $prev ? $prev : -1 ; + $oldid = $prev ? $prev : -1; break; case 'cur': $oldid = 0; diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php index 1e9e503292..b81e5c777e 100644 --- a/includes/api/ApiParse.php +++ b/includes/api/ApiParse.php @@ -101,7 +101,7 @@ class ApiParse extends ApiBase { if ( $rev->isCurrent() ) { // May get from/save to parser cache $p_result = $this->getParsedContent( $pageObj, $popts, - $pageid, isset( $prop['wikitext'] ) ) ; + $pageid, isset( $prop['wikitext'] ) ); } else { // This is an old revision, so get the text differently $this->content = $rev->getContent( Revision::FOR_THIS_USER, $this->getUser() ); @@ -157,7 +157,7 @@ class ApiParse extends ApiBase { // Potentially cached $p_result = $this->getParsedContent( $pageObj, $popts, $pageid, - isset( $prop['wikitext'] ) ) ; + isset( $prop['wikitext'] ) ); } } else { // Not $oldid, $pageid, $page. Hence based on $text $titleObj = Title::newFromText( $title ); diff --git a/includes/cache/SquidUpdate.php b/includes/cache/SquidUpdate.php index bcc8446803..784e30eec8 100644 --- a/includes/cache/SquidUpdate.php +++ b/includes/cache/SquidUpdate.php @@ -67,7 +67,7 @@ class SquidUpdate { $blurlArr = $title->getSquidURLs(); if ( $res->numRows() <= $wgMaxSquidPurgeTitles ) { foreach ( $res as $BL ) { - $tobj = Title::makeTitle( $BL->page_namespace, $BL->page_title ) ; + $tobj = Title::makeTitle( $BL->page_namespace, $BL->page_title ); $blurlArr[] = $tobj->getInternalURL(); } } diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php index fcbbec7127..24464c95cf 100644 --- a/includes/db/DatabaseMssql.php +++ b/includes/db/DatabaseMssql.php @@ -144,7 +144,7 @@ class DatabaseMssql extends DatabaseBase { // $this->limitResult(); if ( preg_match( '/\bLIMIT\s*/i', $sql ) ) { // massage LIMIT -> TopN - $sql = $this->LimitToTopN( $sql ) ; + $sql = $this->LimitToTopN( $sql ); } // MSSQL doesn't have EXTRACT(epoch FROM XXX) @@ -433,7 +433,7 @@ class DatabaseMssql extends DatabaseBase { if ( $k == $identity ) { if( !is_null($v) ) { // there is a value being passed to us, we need to turn on and off inserted identity - $sqlPre = "SET IDENTITY_INSERT $table ON;" ; + $sqlPre = "SET IDENTITY_INSERT $table ON;"; $sqlPost = ";SET IDENTITY_INSERT $table OFF;"; } else { diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php index 3ed4c1fe46..626d84194a 100644 --- a/includes/db/DatabaseOracle.php +++ b/includes/db/DatabaseOracle.php @@ -756,7 +756,7 @@ class DatabaseOracle extends DatabaseBase { function unionQueries( $sqls, $all ) { $glue = ' UNION ALL '; - return 'SELECT * ' . ( $all ? '':'/* UNION_UNIQUE */ ' ) . 'FROM (' . implode( $glue, $sqls ) . ')' ; + return 'SELECT * ' . ( $all ? '':'/* UNION_UNIQUE */ ' ) . 'FROM (' . implode( $glue, $sqls ) . ')'; } function wasDeadlock() { diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php index 0ddebc9a3e..024a46dde1 100644 --- a/includes/filerepo/file/LocalFile.php +++ b/includes/filerepo/file/LocalFile.php @@ -737,7 +737,7 @@ class LocalFile extends File { // Directory where file should be // This happened occasionally due to broken migration code in 1.5 // Rename to broken-* - for ( $i = 0; $i < 100 ; $i++ ) { + for ( $i = 0; $i < 100; $i++ ) { $broken = $this->repo->getZonePath( 'public' ) . "/broken-$i-$thumbName"; if ( !file_exists( $broken ) ) { rename( $thumbPath, $broken ); diff --git a/includes/logging/LogFormatter.php b/includes/logging/LogFormatter.php index 5ff0434433..eb8779f9c9 100644 --- a/includes/logging/LogFormatter.php +++ b/includes/logging/LogFormatter.php @@ -192,7 +192,7 @@ class LogFormatter { $parameters = $entry->getParameters(); // @see LogPage::actionText() // Text of title the action is aimed at. - $target = $entry->getTarget()->getPrefixedText() ; + $target = $entry->getTarget()->getPrefixedText(); $text = null; switch( $entry->getType() ) { case 'move': diff --git a/includes/media/DjVuImage.php b/includes/media/DjVuImage.php index 5300947c08..973579148e 100644 --- a/includes/media/DjVuImage.php +++ b/includes/media/DjVuImage.php @@ -259,7 +259,7 @@ class DjVuImage { # Text layer if ( isset( $wgDjvuTxt ) ) { wfProfileIn( 'djvutxt' ); - $cmd = wfEscapeShellArg( $wgDjvuTxt ) . ' --detail=page ' . wfEscapeShellArg( $this->mFilename ) ; + $cmd = wfEscapeShellArg( $wgDjvuTxt ) . ' --detail=page ' . wfEscapeShellArg( $this->mFilename ); wfDebug( __METHOD__ . ": $cmd\n" ); $retval = ''; $txt = wfShellExec( $cmd, $retval, array(), array( 'memory' => self::DJVUTXT_MEMORY_LIMIT ) ); @@ -281,7 +281,7 @@ EOR; $txt = preg_replace_callback( $reg, array( $this, 'pageTextCallback' ), $txt ); $txt = "\n\n\n" . $txt . "\n\n"; $xml = preg_replace( "//", "", $xml, 1 ); - $xml = $xml . $txt. '' ; + $xml = $xml . $txt. ''; } } wfProfileOut( __METHOD__ ); diff --git a/includes/media/FormatMetadata.php b/includes/media/FormatMetadata.php index 7109f426f1..97aa28b3ef 100644 --- a/includes/media/FormatMetadata.php +++ b/includes/media/FormatMetadata.php @@ -322,7 +322,7 @@ class FormatMetadata { if ( $subTag != 'fired' && $subValue == 0 ) { continue; } - $fullTag = $tag . '-' . $subTag ; + $fullTag = $tag . '-' . $subTag; $flashMsgs[] = self::msg( $fullTag, $subValue ); } $val = $wgLang->commaList( $flashMsgs ); diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index 78bfc34e0a..4d9d60c875 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -1089,7 +1089,7 @@ class Parser { $out .= "\n"; } if ( !array_pop( $has_opened_tr ) ) { - $out .= "\n" ; + $out .= "\n"; } $out .= "\n"; @@ -1130,7 +1130,7 @@ class Parser { # Hook to suspend the parser in this state if ( !wfRunHooks( 'ParserBeforeInternalParse', array( &$this, &$text, &$this->mStripState ) ) ) { wfProfileOut( __METHOD__ ); - return $text ; + return $text; } # if $frame is provided, then use $frame for replacing any variables @@ -1805,7 +1805,7 @@ class Parser { wfProfileOut( __METHOD__ . '-setup' ); # Loop for each link - for ( ; $line !== false && $line !== null ; $a->next(), $line = $a->current() ) { + for ( ; $line !== false && $line !== null; $a->next(), $line = $a->current() ) { # Check for excessive memory usage if ( $holders->isBig() ) { # Too big @@ -1865,7 +1865,7 @@ class Parser { } $trail = ""; } else { # Invalid form; output directly - $s .= $prefix . '[[' . $line ; + $s .= $prefix . '[[' . $line; wfProfileOut( __METHOD__ . "-e1" ); continue; } @@ -1876,7 +1876,7 @@ class Parser { # PROTO: where PROTO is a valid URL protocol; these # should be external links. if ( preg_match( '/^(?i:' . $this->mUrlProtocols . ')/', $m[1] ) ) { - $s .= $prefix . '[[' . $line ; + $s .= $prefix . '[[' . $line; wfProfileOut( __METHOD__ . "-misc" ); continue; } diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php index 4774de4553..bd4bcaced2 100644 --- a/includes/parser/ParserOptions.php +++ b/includes/parser/ParserOptions.php @@ -512,7 +512,7 @@ class ParserOptions { if ( in_array( 'stubthreshold', $forOptions ) ) { $confstr .= '!' . $this->mStubThreshold; } else { - $confstr .= '!*' ; + $confstr .= '!*'; } if ( in_array( 'dateformat', $forOptions ) ) { diff --git a/includes/site/MediaWikiSite.php b/includes/site/MediaWikiSite.php index d4613aa18b..68161b994c 100644 --- a/includes/site/MediaWikiSite.php +++ b/includes/site/MediaWikiSite.php @@ -323,7 +323,7 @@ class MediaWikiSite extends Site { if ( $pageName !== false ) { $pageName = $this->toDBKey( trim( $pageName ) ); - $url = str_replace( '$1', wfUrlencode( $pageName ), $url ) ; + $url = str_replace( '$1', wfUrlencode( $pageName ), $url ); } return $url; diff --git a/includes/site/Site.php b/includes/site/Site.php index 5394860e02..525c3759c6 100644 --- a/includes/site/Site.php +++ b/includes/site/Site.php @@ -378,7 +378,7 @@ class Site implements Serializable { } if ( $pageName !== false ) { - $url = str_replace( '$1', rawurlencode( $pageName ), $url ) ; + $url = str_replace( '$1', rawurlencode( $pageName ), $url ); } return $url; diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php index af4d4fbf1d..d156d20ed6 100644 --- a/includes/specials/SpecialContributions.php +++ b/includes/specials/SpecialContributions.php @@ -445,7 +445,7 @@ class SpecialContributions extends SpecialPage { ( $this->opts['target'] ? array() : array( 'autofocus' ) ) ) . ' ' - ) ; + ); $namespaceSelection = Xml::tags( 'td', array( 'class' => 'mw-label' ), @@ -483,7 +483,7 @@ class SpecialContributions extends SpecialPage { array( 'title' => $this->msg( 'tooltip-namespace_association' )->text(), 'class' => 'mw-input' ) ) . ' ' ) - ) ; + ); if ( $this->getUser()->isAllowed( 'deletedhistory' ) ) { $deletedOnlyCheck = Html::rawElement( 'span', array( 'style' => 'white-space: nowrap' ), @@ -521,7 +521,7 @@ class SpecialContributions extends SpecialPage { $this->msg( 'sp-contributions-submit' )->text(), array( 'class' => 'mw-submit' ) ) - ) ; + ); $form .= Xml::fieldset( $this->msg( 'sp-contributions-search' )->text() ) . diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php index 9eb555aaf6..e676f9438f 100644 --- a/includes/specials/SpecialExport.php +++ b/includes/specials/SpecialExport.php @@ -161,7 +161,7 @@ class SpecialExport extends SpecialPage { $list_authors = $request->getCheck( 'listauthors' ); if ( !$this->curonly || !$wgExportAllowListContributors ) { - $list_authors = false ; + $list_authors = false; } if ( $this->doExport ) { diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index 8180963f28..7a3838e8eb 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -1022,7 +1022,7 @@ class SpecialSearch extends SpecialPage { ); } $out .= Xml::closeElement( 'ul' ); - $out .= Xml::closeElement( 'div' ) ; + $out .= Xml::closeElement( 'div' ); // Results-info if ( $resultsShown > 0 ) { diff --git a/includes/upload/UploadFromChunks.php b/includes/upload/UploadFromChunks.php index 3d8737da2a..5a838ab69b 100644 --- a/includes/upload/UploadFromChunks.php +++ b/includes/upload/UploadFromChunks.php @@ -310,7 +310,7 @@ class UploadFromChunks extends UploadFromFile { if( $index === null ) { $index = $this->getChunkIndex(); } - return $this->mFileKey . '.' . $index ; + return $this->mFileKey . '.' . $index; } }