| Index: trunk/phase3/maintenance/parserTests.inc |
| — | — | @@ -657,7 +657,7 @@ |
| 658 | 658 | $db->query( "DROP TABLE IF EXISTS $newTableName" ); |
| 659 | 659 | } elseif ( in_array( $wgDBtype, array( 'postgres', 'oracle' ) ) ) { |
| 660 | 660 | /* DROPs wouldn't work due to Foreign Key Constraints (bug 14990, r58669) |
| 661 | | - * Use "DROP TABLE IF EXISTS $newTableName CASCADE" for postgres? That |
| | 661 | + * Use "DROP TABLE IF EXISTS $newTableName CASCADE" for postgres? That |
| 662 | 662 | * syntax would also work for mysql. |
| 663 | 663 | */ |
| 664 | 664 | } elseif ( $db->tableExists( $tbl ) ) { |
| Index: trunk/phase3/maintenance/tests/UploadFromUrlTestSuite.php |
| — | — | @@ -13,11 +13,11 @@ |
| 14 | 14 | |
| 15 | 15 | function setUp() { |
| 16 | 16 | global $wgParser, $wgParserConf, $IP, $messageMemc, $wgMemc, $wgDeferredUpdateList, |
| 17 | | - $wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory, $wgEnableParserCache, |
| 18 | | - $wgMessageCache, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $parserMemc, |
| 19 | | - $wgNamespaceAliases, $wgNamespaceProtection, $wgLocalFileRepo, |
| 20 | | - $wgThumbnailScriptPath, $wgScriptPath, |
| 21 | | - $wgArticlePath, $wgStyleSheetPath, $wgScript, $wgStylePath; |
| | 17 | + $wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory, $wgEnableParserCache, |
| | 18 | + $wgMessageCache, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $parserMemc, |
| | 19 | + $wgNamespaceAliases, $wgNamespaceProtection, $wgLocalFileRepo, |
| | 20 | + $wgThumbnailScriptPath, $wgScriptPath, |
| | 21 | + $wgArticlePath, $wgStyleSheetPath, $wgScript, $wgStylePath; |
| 22 | 22 | |
| 23 | 23 | $wgScript = '/index.php'; |
| 24 | 24 | $wgScriptPath = '/'; |
| — | — | @@ -163,10 +163,10 @@ |
| 164 | 164 | return $dir; |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | | - public static function suite() |
| 168 | | - { |
| 169 | | - return new UploadFromUrlTestSuite( 'UploadFromUrlTest' ); |
| 170 | | - } |
| | 167 | + public static function suite() |
| | 168 | + { |
| | 169 | + return new UploadFromUrlTestSuite( 'UploadFromUrlTest' ); |
| | 170 | + } |
| 171 | 171 | |
| 172 | 172 | } |
| 173 | 173 | |
| Index: trunk/phase3/maintenance/tests/LanguageConverterTest.php |
| — | — | @@ -93,7 +93,7 @@ |
| 94 | 94 | $wgUser = User::newFromId( "admin" ); |
| 95 | 95 | $wgUser->setId( 1 ); |
| 96 | 96 | $wgUser->setOption( 'variant', 'tg-latn' ); // The user's data is ignored |
| 97 | | - // because the variant is set in the URL. |
| | 97 | + // because the variant is set in the URL. |
| 98 | 98 | $this->assertEquals( 'tg', $this->lc->getPreferredVariant( true, false ) ); |
| 99 | 99 | $this->assertEquals( 'tg', $this->lc->getPreferredVariant( true, true ) ); |
| 100 | 100 | } |
| Index: trunk/phase3/maintenance/tests/selenium/SeleniumTestSuite.php |
| — | — | @@ -15,7 +15,7 @@ |
| 16 | 16 | if ( $this->isSetUp ) { |
| 17 | 17 | return; |
| 18 | 18 | } |
| 19 | | - $this->isSetUp = true; |
| | 19 | + $this->isSetUp = true; |
| 20 | 20 | $this->selenium = Selenium::getInstance(); |
| 21 | 21 | $this->selenium->start(); |
| 22 | 22 | $this->login(); |
| Index: trunk/phase3/maintenance/tests/selenium/Selenium.php |
| — | — | @@ -81,7 +81,7 @@ |
| 82 | 82 | if ( $value != true ) { |
| 83 | 83 | throw new Testing_Selenium_Exception( "Login Failed" ); |
| 84 | 84 | } |
| 85 | | - |
| | 85 | + |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | public static function getInstance() { |
| — | — | @@ -107,7 +107,7 @@ |
| 108 | 108 | public function log( $message ) { |
| 109 | 109 | $this->logger->write( $message ); |
| 110 | 110 | } |
| 111 | | - |
| | 111 | + |
| 112 | 112 | public function setUrl( $url ) { |
| 113 | 113 | self::$url = $url; |
| 114 | 114 | } |
| Index: trunk/phase3/includes/db/Database.php |
| — | — | @@ -186,7 +186,7 @@ |
| 187 | 187 | |
| 188 | 188 | /** |
| 189 | 189 | * Returns true if this database requires that SELECT DISTINCT queries require that all |
| 190 | | - ORDER BY expressions occur in the SELECT list per the SQL92 standard |
| | 190 | + ORDER BY expressions occur in the SELECT list per the SQL92 standard |
| 191 | 191 | */ |
| 192 | 192 | function standardSelectDistinct() { |
| 193 | 193 | return true; |
| — | — | @@ -2030,7 +2030,7 @@ |
| 2031 | 2031 | * @return Database replication lag in seconds |
| 2032 | 2032 | */ |
| 2033 | 2033 | function getLag() { |
| 2034 | | - return $this->mFakeSlaveLag; |
| | 2034 | + return $this->mFakeSlaveLag; |
| 2035 | 2035 | } |
| 2036 | 2036 | |
| 2037 | 2037 | /** |
| — | — | @@ -2096,7 +2096,7 @@ |
| 2097 | 2097 | throw $e; |
| 2098 | 2098 | } |
| 2099 | 2099 | } |
| 2100 | | - |
| | 2100 | + |
| 2101 | 2101 | fclose( $fp ); |
| 2102 | 2102 | return $error; |
| 2103 | 2103 | } |
| — | — | @@ -2554,16 +2554,16 @@ |
| 2555 | 2555 | <small>$outofdate</small></div> |
| 2556 | 2556 | <!-- SiteSearch Google --> |
| 2557 | 2557 | <form method="get" action="http://www.google.com/search" id="googlesearch"> |
| 2558 | | - <input type="hidden" name="domains" value="$wgServer" /> |
| 2559 | | - <input type="hidden" name="num" value="50" /> |
| 2560 | | - <input type="hidden" name="ie" value="$wgInputEncoding" /> |
| 2561 | | - <input type="hidden" name="oe" value="$wgInputEncoding" /> |
| | 2558 | + <input type="hidden" name="domains" value="$wgServer" /> |
| | 2559 | + <input type="hidden" name="num" value="50" /> |
| | 2560 | + <input type="hidden" name="ie" value="$wgInputEncoding" /> |
| | 2561 | + <input type="hidden" name="oe" value="$wgInputEncoding" /> |
| 2562 | 2562 | |
| 2563 | | - <input type="text" name="q" size="31" maxlength="255" value="$search" /> |
| 2564 | | - <input type="submit" name="btnG" value="$googlesearch" /> |
| | 2563 | + <input type="text" name="q" size="31" maxlength="255" value="$search" /> |
| | 2564 | + <input type="submit" name="btnG" value="$googlesearch" /> |
| 2565 | 2565 | <div> |
| 2566 | | - <input type="radio" name="sitesearch" id="gwiki" value="$wgServer" checked="checked" /><label for="gwiki">$wgSitename</label> |
| 2567 | | - <input type="radio" name="sitesearch" id="gWWW" value="" /><label for="gWWW">WWW</label> |
| | 2566 | + <input type="radio" name="sitesearch" id="gwiki" value="$wgServer" checked="checked" /><label for="gwiki">$wgSitename</label> |
| | 2567 | + <input type="radio" name="sitesearch" id="gWWW" value="" /><label for="gWWW">WWW</label> |
| 2568 | 2568 | </div> |
| 2569 | 2569 | </form> |
| 2570 | 2570 | <!-- SiteSearch Google --> |
| Index: trunk/phase3/includes/filerepo/LocalFile.php |
| — | — | @@ -73,7 +73,7 @@ |
| 74 | 74 | $file->loadFromRow( $row ); |
| 75 | 75 | return $file; |
| 76 | 76 | } |
| 77 | | - |
| | 77 | + |
| 78 | 78 | /** |
| 79 | 79 | * Create a LocalFile from a SHA-1 key |
| 80 | 80 | * Do not call this except from inside a repo class. |
| — | — | @@ -91,7 +91,7 @@ |
| 92 | 92 | return false; |
| 93 | 93 | } |
| 94 | 94 | } |
| 95 | | - |
| | 95 | + |
| 96 | 96 | /** |
| 97 | 97 | * Fields in the image table |
| 98 | 98 | */ |
| — | — | @@ -130,7 +130,7 @@ |
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | /** |
| 134 | | - * Get the memcached key for the main data for this file, or false if |
| | 134 | + * Get the memcached key for the main data for this file, or false if |
| 135 | 135 | * there is no access to the shared cache. |
| 136 | 136 | */ |
| 137 | 137 | function getCacheKey() { |
| — | — | @@ -655,7 +655,7 @@ |
| 656 | 656 | $opts['ORDER BY'] = "oi_timestamp $order"; |
| 657 | 657 | $opts['USE INDEX'] = array( 'oldimage' => 'oi_name_timestamp' ); |
| 658 | 658 | |
| 659 | | - wfRunHooks( 'LocalFile::getHistory', array( &$this, &$tables, &$fields, |
| | 659 | + wfRunHooks( 'LocalFile::getHistory', array( &$this, &$tables, &$fields, |
| 660 | 660 | &$conds, &$opts, &$join_conds ) ); |
| 661 | 661 | |
| 662 | 662 | $res = $dbr->select( $tables, $fields, $conds, __METHOD__, $opts, $join_conds ); |
| — | — | @@ -792,7 +792,7 @@ |
| 793 | 793 | { |
| 794 | 794 | if( is_null( $user ) ) { |
| 795 | 795 | global $wgUser; |
| 796 | | - $user = $wgUser; |
| | 796 | + $user = $wgUser; |
| 797 | 797 | } |
| 798 | 798 | |
| 799 | 799 | $dbw = $this->repo->getMasterDB(); |
| — | — | @@ -914,7 +914,7 @@ |
| 915 | 915 | $nullRevision = Revision::newNullRevision( $dbw, $descTitle->getArticleId(), |
| 916 | 916 | $log->getRcComment(), false ); |
| 917 | 917 | $nullRevision->insertOn( $dbw ); |
| 918 | | - |
| | 918 | + |
| 919 | 919 | wfRunHooks( 'NewRevisionFromEditComplete', array( $article, $nullRevision, $latest, $user ) ); |
| 920 | 920 | $article->updateRevisionOn( $dbw, $nullRevision ); |
| 921 | 921 | |
| — | — | @@ -1023,7 +1023,7 @@ |
| 1024 | 1024 | // Purge the new image |
| 1025 | 1025 | $this->purgeEverything(); |
| 1026 | 1026 | } |
| 1027 | | - |
| | 1027 | + |
| 1028 | 1028 | return $status; |
| 1029 | 1029 | } |
| 1030 | 1030 | |
| — | — | @@ -1870,7 +1870,7 @@ |
| 1871 | 1871 | $dbw = $this->db; |
| 1872 | 1872 | |
| 1873 | 1873 | // Update current image |
| 1874 | | - $dbw->update( |
| | 1874 | + $dbw->update( |
| 1875 | 1875 | 'image', |
| 1876 | 1876 | array( 'img_name' => $this->newName ), |
| 1877 | 1877 | array( 'img_name' => $this->oldName ), |
| — | — | @@ -1902,7 +1902,7 @@ |
| 1903 | 1903 | |
| 1904 | 1904 | /** |
| 1905 | 1905 | * Generate triplets for FSRepo::storeBatch(). |
| 1906 | | - */ |
| | 1906 | + */ |
| 1907 | 1907 | function getMoveTriplets() { |
| 1908 | 1908 | $moves = array_merge( array( $this->cur ), $this->olds ); |
| 1909 | 1909 | $triplets = array(); // The format is: (srcUrl, destZone, destUrl) |
| — | — | @@ -1917,7 +1917,7 @@ |
| 1918 | 1918 | |
| 1919 | 1919 | /** |
| 1920 | 1920 | * Removes non-existent files from move batch. |
| 1921 | | - */ |
| | 1921 | + */ |
| 1922 | 1922 | function removeNonexistentFiles( $triplets ) { |
| 1923 | 1923 | $files = array(); |
| 1924 | 1924 | foreach( $triplets as $file ) |
| Index: trunk/phase3/includes/installer/CliInstaller.php |
| — | — | @@ -35,7 +35,7 @@ |
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * Constructor. |
| 39 | | - * |
| | 39 | + * |
| 40 | 40 | * @param $siteName |
| 41 | 41 | * @param $admin |
| 42 | 42 | * @param $option Array |
| — | — | @@ -59,7 +59,7 @@ |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | $this->setVar( 'wgSitename', $siteName ); |
| 63 | | - |
| | 63 | + |
| 64 | 64 | if ( $admin ) { |
| 65 | 65 | $this->setVar( '_AdminName', $admin ); |
| 66 | 66 | } |
| — | — | @@ -96,7 +96,7 @@ |
| 97 | 97 | |
| 98 | 98 | public function endStage( $step, $status ) { |
| 99 | 99 | $warnings = $status->getWarningsArray(); |
| 100 | | - |
| | 100 | + |
| 101 | 101 | if ( !$status->isOk() ) { |
| 102 | 102 | $this->showStatusMessage( $status ); |
| 103 | 103 | echo "\n"; |
| — | — | @@ -107,7 +107,7 @@ |
| 108 | 108 | wfMsg( 'word-separator' ) ); |
| 109 | 109 | } |
| 110 | 110 | } |
| 111 | | - |
| | 111 | + |
| 112 | 112 | $this->showMessage( wfMsg( 'config-install-step-done' ) ."\n"); |
| 113 | 113 | } |
| 114 | 114 | |
| Index: trunk/phase3/includes/HttpFunctions.php |
| — | — | @@ -26,7 +26,7 @@ |
| 27 | 27 | * - sslVerifyCert (curl only) Verify SSL certificate |
| 28 | 28 | * - caInfo (curl only) Provide CA information |
| 29 | 29 | * - maxRedirects Maximum number of redirects to follow (defaults to 5) |
| 30 | | - * - followRedirects Whether to follow redirects (defaults to false). |
| | 30 | + * - followRedirects Whether to follow redirects (defaults to false). |
| 31 | 31 | * Note: this should only be used when the target URL is trusted, |
| 32 | 32 | * to avoid attacks on intranet services accessible by HTTP. |
| 33 | 33 | * @return Mixed: (bool)false on failure or a string on success |
| — | — | @@ -222,7 +222,7 @@ |
| 223 | 223 | |
| 224 | 224 | /** |
| 225 | 225 | * Set the parameters of the request |
| 226 | | - |
| | 226 | + |
| 227 | 227 | * @param $args Array |
| 228 | 228 | * @todo overload the args param |
| 229 | 229 | */ |
| — | — | @@ -502,7 +502,7 @@ |
| 503 | 503 | } |
| 504 | 504 | |
| 505 | 505 | /** |
| 506 | | - * Returns true if the backend can follow redirects. Overridden by the |
| | 506 | + * Returns true if the backend can follow redirects. Overridden by the |
| 507 | 507 | * child classes. |
| 508 | 508 | */ |
| 509 | 509 | public function canFollowRedirects() { |
| — | — | @@ -767,7 +767,7 @@ |
| 768 | 768 | if ( isset( $this->sslVerifyHost ) ) { |
| 769 | 769 | $this->curlOptions[CURLOPT_SSL_VERIFYHOST] = $this->sslVerifyHost; |
| 770 | 770 | } |
| 771 | | - |
| | 771 | + |
| 772 | 772 | if ( isset( $this->sslVerifyCert ) ) { |
| 773 | 773 | $this->curlOptions[CURLOPT_SSL_VERIFYPEER] = $this->sslVerifyCert; |
| 774 | 774 | } |
| — | — | @@ -800,7 +800,7 @@ |
| 801 | 801 | if ( ! @curl_setopt( $curlHandle, CURLOPT_FOLLOWLOCATION, true ) ) { |
| 802 | 802 | wfDebug( __METHOD__.": Couldn't set CURLOPT_FOLLOWLOCATION. " . |
| 803 | 803 | "Probably safe_mode or open_basedir is set.\n"); |
| 804 | | - // Continue the processing. If it were in curl_setopt_array, |
| | 804 | + // Continue the processing. If it were in curl_setopt_array, |
| 805 | 805 | // processing would have halted on its entry |
| 806 | 806 | } |
| 807 | 807 | } |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -664,10 +664,10 @@ |
| 665 | 665 | |
| 666 | 666 | wfProfileOut( __METHOD__ ); |
| 667 | 667 | } |
| 668 | | - |
| | 668 | + |
| 669 | 669 | /** |
| 670 | 670 | * Get the query to generate a dynamic stylesheet |
| 671 | | - * |
| | 671 | + * |
| 672 | 672 | * @return array |
| 673 | 673 | */ |
| 674 | 674 | public static function getDynamicStylesheetQuery() { |
| — | — | @@ -2140,14 +2140,14 @@ |
| 2141 | 2141 | * Currently only used for MediaWiki:Sidebar (but may be used by Extensions) |
| 2142 | 2142 | * |
| 2143 | 2143 | * This is just a wrapper around addToSidebarPlain() for backwards compatibility |
| 2144 | | - * |
| | 2144 | + * |
| 2145 | 2145 | * @param &$bar array |
| 2146 | 2146 | * @param $message String |
| 2147 | 2147 | */ |
| 2148 | 2148 | function addToSidebar( &$bar, $message ) { |
| 2149 | 2149 | $this->addToSidebarPlain( $bar, wfMsgForContent( $message ) ); |
| 2150 | 2150 | } |
| 2151 | | - |
| | 2151 | + |
| 2152 | 2152 | /** |
| 2153 | 2153 | * Add content from plain text |
| 2154 | 2154 | * @since 1.17 |
| — | — | @@ -2205,12 +2205,12 @@ |
| 2206 | 2206 | ); |
| 2207 | 2207 | } else if ( (substr($line, 0, 2) == '{{') && (substr($line, -2) == '}}') ) { |
| 2208 | 2208 | global $wgParser, $wgTitle; |
| 2209 | | - |
| | 2209 | + |
| 2210 | 2210 | $line = substr($line, 2, strlen($line) - 4 ); |
| 2211 | | - |
| | 2211 | + |
| 2212 | 2212 | if (is_null($wgParser->mOptions)) |
| 2213 | 2213 | $wgParser->mOptions = new ParserOptions(); |
| 2214 | | - |
| | 2214 | + |
| 2215 | 2215 | $wgParser->mOptions->setEditSection(false); |
| 2216 | 2216 | $wikiBar[$heading] = $wgParser->parse( wfMsgForContentNoTrans( $line ) , $wgTitle, $wgParser->mOptions )->getText(); |
| 2217 | 2217 | } else { |
| — | — | @@ -2218,10 +2218,10 @@ |
| 2219 | 2219 | } |
| 2220 | 2220 | } |
| 2221 | 2221 | } |
| 2222 | | - |
| | 2222 | + |
| 2223 | 2223 | if ( count($wikiBar) > 0 ) |
| 2224 | 2224 | $bar = array_merge($bar, $wikiBar); |
| 2225 | | - |
| | 2225 | + |
| 2226 | 2226 | return $bar; |
| 2227 | 2227 | } |
| 2228 | 2228 | |
| Index: trunk/phase3/includes/Exception.php |
| — | — | @@ -229,7 +229,7 @@ |
| 230 | 230 | function htmlFooter() { |
| 231 | 231 | return "</body></html>"; |
| 232 | 232 | } |
| 233 | | - |
| | 233 | + |
| 234 | 234 | /** |
| 235 | 235 | * headers handled by subclass? |
| 236 | 236 | */ |