From: umherirrender Date: Fri, 26 Oct 2012 16:18:59 +0000 (+0200) Subject: Fix tabs inside/between statements/text X-Git-Tag: 1.31.0-rc.0~21849^2 X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=82375631c21d7940b091269673cc92c042496d95;p=lhc%2Fweb%2Fwiklou.git Fix tabs inside/between statements/text This tabs are strange and a space there is better Change-Id: I0885dff575ee2fcd0668d08fef3226e132c5b319 --- diff --git a/includes/Block.php b/includes/Block.php index 86b4d13d36..e05b2acfa4 100644 --- a/includes/Block.php +++ b/includes/Block.php @@ -164,7 +164,7 @@ class Block { /** * Check if two blocks are effectively equal. Doesn't check irrelevant things like - * the blocking user or the block timestamp, only things which affect the blocked user * + * the blocking user or the block timestamp, only things which affect the blocked user * * @param $block Block * @@ -536,10 +536,10 @@ class Block { 'ipb_expiry' => $expiry, 'ipb_range_start' => $this->getRangeStart(), 'ipb_range_end' => $this->getRangeEnd(), - 'ipb_deleted' => intval( $this->mHideName ), // typecast required for SQLite + 'ipb_deleted' => intval( $this->mHideName ), // typecast required for SQLite 'ipb_block_email' => $this->prevents( 'sendemail' ), 'ipb_allow_usertalk' => !$this->prevents( 'editownusertalk' ), - 'ipb_parent_block_id' => $this->mParentBlockId + 'ipb_parent_block_id' => $this->mParentBlockId ); return $a; diff --git a/includes/Cookie.php b/includes/Cookie.php index 1b86f5da83..48216f0d87 100644 --- a/includes/Cookie.php +++ b/includes/Cookie.php @@ -194,7 +194,7 @@ class CookieJar { private $cookie = array(); /** - * Set a cookie in the cookie jar. Make sure only one cookie per-name exists. + * Set a cookie in the cookie jar. Make sure only one cookie per-name exists. * @see Cookie::set() */ public function setCookie ( $name, $value, $attr ) { diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index dd9d73b0aa..f146943cbb 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -2591,12 +2591,12 @@ $wgSiteNotice = ''; /** * A subtitle to add to the tagline, for skins that have it/ */ -$wgExtraSubtitle = ''; +$wgExtraSubtitle = ''; /** * If this is set, a "donate" link will appear in the sidebar. Set it to a URL. */ -$wgSiteSupportPage = ''; +$wgSiteSupportPage = ''; /** * Validate the overall output using tidy and refuse diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php index 32f77dcfab..e621f625ac 100644 --- a/includes/HttpFunctions.php +++ b/includes/HttpFunctions.php @@ -581,8 +581,8 @@ class MWHttpRequest { } /** - * Sets a cookie. Used before a request to set up any individual - * cookies. Used internally after a request to parse the + * Sets a cookie. Used before a request to set up any individual + * cookies. Used internally after a request to parse the * Set-Cookie headers. * @see Cookie::set * @param $name diff --git a/includes/MagicWord.php b/includes/MagicWord.php index 42791f57a5..6d2e1dca94 100644 --- a/includes/MagicWord.php +++ b/includes/MagicWord.php @@ -534,7 +534,7 @@ class MagicWord { * * @return string */ - function getVariableRegex() { + function getVariableRegex() { if ( $this->mVariableRegex == '' ) { $this->initRegex(); } diff --git a/includes/RecentChange.php b/includes/RecentChange.php index b86a3c8d4f..2f221a8989 100644 --- a/includes/RecentChange.php +++ b/includes/RecentChange.php @@ -604,9 +604,9 @@ class RecentChange { 'rc_minor' => $row->rev_minor_edit ? 1 : 0, 'rc_type' => $row->page_is_new ? RC_NEW : RC_EDIT, 'rc_cur_id' => $row->page_id, - 'rc_this_oldid' => $row->rev_id, - 'rc_last_oldid' => isset( $row->rc_last_oldid ) ? $row->rc_last_oldid : 0, - 'rc_bot' => 0, + 'rc_this_oldid' => $row->rev_id, + 'rc_last_oldid' => isset( $row->rc_last_oldid ) ? $row->rc_last_oldid : 0, + 'rc_bot' => 0, 'rc_ip' => '', 'rc_id' => $row->rc_id, 'rc_patrolled' => $row->rc_patrolled, diff --git a/includes/Title.php b/includes/Title.php index b1569e2837..00fdc3a469 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -1398,7 +1398,7 @@ class Title { * * @param $query string|array an optional query string, - * not used for interwiki links. Can be specified as an associative array as well, + * not used for interwiki links. Can be specified as an associative array as well, * e.g., array( 'action' => 'edit' ) (keys and values will be URL-escaped). * Some query patterns will trigger various shorturl path replacements. * @param $query2 Mixed: An optional secondary query array. This one MUST @@ -4474,7 +4474,7 @@ class Title { /** * Update page_touched timestamps and send squid purge messages for - * pages linking to this title. May be sent to the job queue depending + * pages linking to this title. May be sent to the job queue depending * on the number of links. Typically called on create and delete. */ public function touchLinks() { diff --git a/includes/UserMailer.php b/includes/UserMailer.php index 9830f69578..b9ce9e0574 100644 --- a/includes/UserMailer.php +++ b/includes/UserMailer.php @@ -273,7 +273,7 @@ class UserMailer { } wfRestoreWarnings(); return Status::newGood(); - } else { + } else { # # PHP mail() # diff --git a/includes/Xml.php b/includes/Xml.php index 2f8ba0fe39..67f365848d 100644 --- a/includes/Xml.php +++ b/includes/Xml.php @@ -576,7 +576,8 @@ class Xml { */ public static function textarea( $name, $content, $cols = 40, $rows = 5, $attribs = array() ) { return self::element( 'textarea', - array( 'name' => $name, + array( + 'name' => $name, 'id' => $name, 'cols' => $cols, 'rows' => $rows diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php index ca62bc6930..ec1b06e4c1 100644 --- a/includes/api/ApiEditPage.php +++ b/includes/api/ApiEditPage.php @@ -568,7 +568,7 @@ class ApiEditPage extends ApiBase { 'watch' => 'Add the page to your watchlist', 'unwatch' => 'Remove the page from your watchlist', 'watchlist' => 'Unconditionally add or remove the page from your watchlist, use preferences or do not change watch', - 'md5' => array( "The MD5 hash of the {$p}text parameter, or the {$p}prependtext and {$p}appendtext parameters concatenated.", + 'md5' => array( "The MD5 hash of the {$p}text parameter, or the {$p}prependtext and {$p}appendtext parameters concatenated.", 'If set, the edit won\'t be done unless the hash is correct' ), 'prependtext' => "Add this text to the beginning of the page. Overrides {$p}text", 'appendtext' => array( "Add this text to the end of the page. Overrides {$p}text.", diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index 3aa51b7967..a399c1ebff 100644 --- a/includes/api/ApiMain.php +++ b/includes/api/ApiMain.php @@ -119,7 +119,7 @@ class ApiMain extends ApiBase { 'msg' => 'Use of the write API', 'params' => array() ), - 'apihighlimits' => array( + 'apihighlimits' => array( 'msg' => 'Use higher limits in API queries (Slow queries: $1 results; Fast queries: $2 results). The limits for slow queries also apply to multivalue parameters.', 'params' => array( ApiBase::LIMIT_SML2, ApiBase::LIMIT_BIG2 ) ) diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php index dff7524d88..d24745cebb 100644 --- a/includes/api/ApiQuery.php +++ b/includes/api/ApiQuery.php @@ -545,7 +545,7 @@ class ApiQuery extends ApiBase { * @param $pageSet ApiPageSet Pages to be exported * @param $result ApiResult Result to output to */ - private function doExport( $pageSet, $result ) { + private function doExport( $pageSet, $result ) { $exportTitles = array(); $titles = $pageSet->getGoodTitles(); if ( count( $titles ) ) { diff --git a/includes/api/ApiQueryBlocks.php b/includes/api/ApiQueryBlocks.php index 96b8696240..a8d4a7c327 100644 --- a/includes/api/ApiQueryBlocks.php +++ b/includes/api/ApiQueryBlocks.php @@ -301,7 +301,7 @@ class ApiQueryBlocks extends ApiQueryBase { 'dir' => $this->getDirectionDescription( $p ), 'ids' => 'List of block IDs to list (optional)', 'users' => 'List of users to search for (optional)', - 'ip' => array( 'Get all blocks applying to this IP or CIDR range, including range blocks.', + 'ip' => array( 'Get all blocks applying to this IP or CIDR range, including range blocks.', 'Cannot be used together with bkusers. CIDR ranges broader than /16 are not accepted' ), 'limit' => 'The maximum amount of blocks to list', 'prop' => array( diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php index b617ed05d5..e5cea96421 100644 --- a/includes/api/ApiQueryInfo.php +++ b/includes/api/ApiQueryInfo.php @@ -394,7 +394,7 @@ class ApiQueryInfo extends ApiQueryBase { } } - if ( $this->fld_talkid && isset( $this->talkids[$ns][$dbkey] ) ) { + if ( $this->fld_talkid && isset( $this->talkids[$ns][$dbkey] ) ) { $pageInfo['talkid'] = $this->talkids[$ns][$dbkey]; } diff --git a/includes/diff/DairikiDiff.php b/includes/diff/DairikiDiff.php index 72eb5d3c2c..05e2cd2925 100644 --- a/includes/diff/DairikiDiff.php +++ b/includes/diff/DairikiDiff.php @@ -311,7 +311,7 @@ class _DiffEngine { * [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally * sized segments. * - * Returns (LCS, PTS). LCS is the length of the LCS. PTS is an + * Returns (LCS, PTS). LCS is the length of the LCS. PTS is an * array of NCHUNKS+1 (X, Y) indexes giving the diving points between * sub sequences. The first sub-sequence is contained in [X0, X1), * [Y0, Y1), the second in [X1, X2), [Y1, Y2) and so on. Note diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php index caa93a42c6..f42df55c04 100644 --- a/includes/filerepo/file/LocalFile.php +++ b/includes/filerepo/file/LocalFile.php @@ -1759,7 +1759,7 @@ class LocalFileDeleteBatch { 'fa_deleted_user' => $encUserId, 'fa_deleted_timestamp' => $encTimestamp, 'fa_deleted_reason' => $encReason, - 'fa_deleted' => $this->suppress ? $bitfield : 0, + 'fa_deleted' => $this->suppress ? $bitfield : 0, 'fa_name' => 'img_name', 'fa_archive_name' => 'NULL', diff --git a/includes/parser/Preprocessor_DOM.php b/includes/parser/Preprocessor_DOM.php index b2dd7db1a1..53f3febc27 100644 --- a/includes/parser/Preprocessor_DOM.php +++ b/includes/parser/Preprocessor_DOM.php @@ -797,8 +797,8 @@ class PPDStack { * @ingroup Parser */ class PPDStackElement { - var $open, // Opening character (\n for heading) - $close, // Matching closing character + var $open, // Opening character (\n for heading) + $close, // Matching closing character $count, // Number of opening characters found (number of "=" for heading) $parts, // Array of PPDPart objects describing pipe-separated parts. $lineStart; // True if the open char appeared at the start of the input line. Not set for headings. diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php index c880b61759..3d39e370c5 100644 --- a/includes/specials/SpecialDeletedContributions.php +++ b/includes/specials/SpecialDeletedContributions.php @@ -260,7 +260,7 @@ class DeletedContributionsPage extends SpecialPage { * Special page "deleted user contributions". * Shows a list of the deleted contributions of a user. * - * @param $par String: (optional) user name of the user for which to show the contributions + * @param $par String: (optional) user name of the user for which to show the contributions */ function execute( $par ) { global $wgQueryPageDefaultLimit; diff --git a/includes/specials/SpecialLinkSearch.php b/includes/specials/SpecialLinkSearch.php index 0810ee777a..5de60769bd 100644 --- a/includes/specials/SpecialLinkSearch.php +++ b/includes/specials/SpecialLinkSearch.php @@ -103,7 +103,7 @@ class LinkSearchPage extends QueryPage { ) ); } - $s .= Xml::submitButton( $this->msg( 'linksearch-ok' )->text() ) . + $s .= Xml::submitButton( $this->msg( 'linksearch-ok' )->text() ) . '' . Xml::closeElement( 'form' ); $out->addHTML( $s ); diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php index 56ae302013..0616d56fad 100644 --- a/includes/specials/SpecialUserrights.php +++ b/includes/specials/SpecialUserrights.php @@ -535,7 +535,7 @@ class UserrightsPage extends SpecialPage { } # Build the HTML table - $ret .= Xml::openElement( 'table', array( 'class' => 'mw-userrights-groups' ) ) . + $ret .= Xml::openElement( 'table', array( 'class' => 'mw-userrights-groups' ) ) . "\n"; foreach( $columns as $name => $column ) { if( $column === array() ) diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php index 601660591b..79783cc14f 100644 --- a/languages/LanguageConverter.php +++ b/languages/LanguageConverter.php @@ -824,9 +824,9 @@ class LanguageConverter { /** * Guess if a text is written in a variant. This should be implemented in subclasses. * - * @param string $text the text to be checked - * @param string $variant language code of the variant to be checked for - * @return bool true if $text appears to be written in $variant, false if not + * @param string $text the text to be checked + * @param string $variant language code of the variant to be checked for + * @return bool true if $text appears to be written in $variant, false if not * * @author Nikola Smolenski * @since 1.19 @@ -1270,7 +1270,7 @@ class ConverterRule { $bidtable[$v] = $to; } elseif ( count( $u ) == 2 ) { $from = trim( $u[0] ); - $v = trim( $u[1] ); + $v = trim( $u[1] ); if ( array_key_exists( $v, $unidtable ) && !is_array( $unidtable[$v] ) && $to diff --git a/languages/classes/LanguageEo.php b/languages/classes/LanguageEo.php index 3c16248037..8f8432242b 100644 --- a/languages/classes/LanguageEo.php +++ b/languages/classes/LanguageEo.php @@ -63,7 +63,7 @@ class LanguageEo extends Language { if ( strcasecmp( $in, 'x' ) == 0 && strcasecmp( $out, 'utf-8' ) == 0 ) { return preg_replace_callback ( '/([cghjsu]x?)((?:xx)*)(?!x)/i', - array( $this, 'strrtxuCallback' ), $string ); + array( $this, 'strrtxuCallback' ), $string ); } elseif ( strcasecmp( $in, 'UTF-8' ) == 0 && strcasecmp( $out, 'x' ) == 0 ) { # Double Xs only if they follow cxapelutaj literoj. return preg_replace_callback( diff --git a/maintenance/importImages.php b/maintenance/importImages.php index a8cd2ff959..d94b948576 100644 --- a/maintenance/importImages.php +++ b/maintenance/importImages.php @@ -326,7 +326,7 @@ USAGE: php importImages.php [options] : Path to the directory containing images to be imported Options: ---extensions= Comma-separated list of allowable extensions, defaults to \$wgFileExtensions +--extensions= Comma-separated list of allowable extensions, defaults to \$wgFileExtensions --overwrite Overwrite existing images with the same name (default is to skip them) --limit= Limit the number of images to process. Ignored or skipped images are not counted. --from= Ignore all files until the one with the given name. Useful for resuming