| Index: trunk/phase3/skins/Vector.php |
| — | — | @@ -373,26 +373,26 @@ |
| 374 | 374 | } |
| 375 | 375 | $nav[$section][$key]['attributes'] = |
| 376 | 376 | ' id="' . Sanitizer::escapeId( $xmlID ) . '"'; |
| 377 | | - if ( $nav[$section][$key]['class'] ) { |
| | 377 | + if ( $nav[$section][$key]['class'] ) { |
| 378 | 378 | $nav[$section][$key]['attributes'] .= |
| 379 | 379 | ' class="' . htmlspecialchars( $link['class'] ) . '"'; |
| 380 | 380 | unset( $nav[$section][$key]['class'] ); |
| 381 | | - } |
| | 381 | + } |
| 382 | 382 | // We don't want to give the watch tab an accesskey if the page |
| 383 | 383 | // is being edited, because that conflicts with the accesskey on |
| 384 | 384 | // the watch checkbox. We also don't want to give the edit tab |
| 385 | 385 | // an accesskey, because that's fairly superfluous and conflicts |
| 386 | 386 | // with an accesskey (Ctrl-E) often used for editing in Safari. |
| 387 | | - if ( |
| | 387 | + if ( |
| 388 | 388 | in_array( $action, array( 'edit', 'submit' ) ) && |
| 389 | 389 | in_array( $key, array( 'edit', 'watch', 'unwatch' ) ) |
| 390 | 390 | ) { |
| 391 | | - $nav[$section][$key]['key'] = |
| | 391 | + $nav[$section][$key]['key'] = |
| 392 | 392 | $this->skin->tooltip( $xmlID ); |
| 393 | | - } else { |
| 394 | | - $nav[$section][$key]['key'] = |
| | 393 | + } else { |
| | 394 | + $nav[$section][$key]['key'] = |
| 395 | 395 | $this->skin->tooltipAndAccesskey( $xmlID ); |
| 396 | | - } |
| | 396 | + } |
| 397 | 397 | } |
| 398 | 398 | } |
| 399 | 399 | $this->data['namespace_urls'] = $nav['namespaces']; |
| — | — | @@ -434,7 +434,7 @@ |
| 435 | 435 | $footerlinksClasses = array( |
| 436 | 436 | 'icons' => array( 'noprint' ) |
| 437 | 437 | ); |
| 438 | | - |
| | 438 | + |
| 439 | 439 | // Reduce footer links down to only those which are being used |
| 440 | 440 | $validFooterLinks = array(); |
| 441 | 441 | foreach( $footerlinks as $category => $links ) { |
| Index: trunk/phase3/includes/User.php |
| — | — | @@ -556,7 +556,7 @@ |
| 557 | 557 | * either by batch processes or by user accounts which have |
| 558 | 558 | * already been created. |
| 559 | 559 | * |
| 560 | | - * Additional blacklisting may be added here rather than in |
| | 560 | + * Additional blacklisting may be added here rather than in |
| 561 | 561 | * isValidUserName() to avoid disrupting existing accounts. |
| 562 | 562 | * |
| 563 | 563 | * @param $name \string String to match |
| — | — | @@ -615,7 +615,7 @@ |
| 616 | 616 | return 'passwordtooshort'; |
| 617 | 617 | } elseif ( $lcPassword == $wgContLang->lc( $this->mName ) ) { |
| 618 | 618 | return 'password-name-match'; |
| 619 | | - } elseif ( in_array( $lcPassword, $wgWeakPasswords ) ) { |
| | 619 | + } elseif ( in_array( $lcPassword, $wgWeakPasswords ) ) { |
| 620 | 620 | return 'password-too-weak'; |
| 621 | 621 | } else { |
| 622 | 622 | //it seems weird returning true here, but this is because of the |
| — | — | @@ -658,7 +658,7 @@ |
| 659 | 659 | [$rfc1034_ldh_str]+ # First domain part |
| 660 | 660 | (\\.[$rfc1034_ldh_str]+)+ # Following part prefixed with a dot |
| 661 | 661 | $ # End of string |
| 662 | | - /ix" ; // case Insensitive, eXtended |
| | 662 | + /ix" ; // case Insensitive, eXtended |
| 663 | 663 | |
| 664 | 664 | return (bool) preg_match( $HTML5_email_regexp, $addr ); |
| 665 | 665 | } |
| — | — | @@ -1762,11 +1762,11 @@ |
| 1763 | 1763 | } |
| 1764 | 1764 | |
| 1765 | 1765 | if( !$this->isValidPassword( $str ) ) { |
| 1766 | | - global $wgMinimalPasswordLength; |
| | 1766 | + global $wgMinimalPasswordLength; |
| 1767 | 1767 | $valid = $this->getPasswordValidity( $str ); |
| 1768 | 1768 | throw new PasswordError( wfMsgExt( $valid, array( 'parsemag' ), |
| 1769 | 1769 | $wgMinimalPasswordLength ) ); |
| 1770 | | - } |
| | 1770 | + } |
| 1771 | 1771 | } |
| 1772 | 1772 | |
| 1773 | 1773 | if( !$wgAuth->setPassword( $this, $str ) ) { |
| — | — | @@ -2038,7 +2038,7 @@ |
| 2039 | 2039 | global $wgMaxArticleSize; # Maximum article size, in Kb |
| 2040 | 2040 | $threshold = intval( $this->getOption( 'stubthreshold' ) ); |
| 2041 | 2041 | if ( $threshold > $wgMaxArticleSize * 1024 ) { |
| 2042 | | - # If they have set an impossible value, disable the preference |
| | 2042 | + # If they have set an impossible value, disable the preference |
| 2043 | 2043 | # so we can use the parser cache again. |
| 2044 | 2044 | $threshold = 0; |
| 2045 | 2045 | } |
| — | — | @@ -2248,7 +2248,7 @@ |
| 2249 | 2249 | return $this->mSkin; |
| 2250 | 2250 | } |
| 2251 | 2251 | } |
| 2252 | | - |
| | 2252 | + |
| 2253 | 2253 | // Creates a Skin object, for getSkin() |
| 2254 | 2254 | private function createSkinObject() { |
| 2255 | 2255 | wfProfileIn( __METHOD__ ); |
| — | — | @@ -2267,7 +2267,7 @@ |
| 2268 | 2268 | |
| 2269 | 2269 | $skin = Skin::newFromKey( $userSkin ); |
| 2270 | 2270 | wfProfileOut( __METHOD__ ); |
| 2271 | | - |
| | 2271 | + |
| 2272 | 2272 | return $skin; |
| 2273 | 2273 | } |
| 2274 | 2274 | |
| — | — | @@ -2402,7 +2402,7 @@ |
| 2403 | 2403 | |
| 2404 | 2404 | // If an option is not set in $str, use the default value |
| 2405 | 2405 | $this->mOptions = self::getDefaultOptions(); |
| 2406 | | - |
| | 2406 | + |
| 2407 | 2407 | $a = explode( "\n", $str ); |
| 2408 | 2408 | foreach ( $a as $s ) { |
| 2409 | 2409 | $m = array(); |
| — | — | @@ -2514,8 +2514,8 @@ |
| 2515 | 2515 | 'user_newpassword' => $this->mNewpassword, |
| 2516 | 2516 | 'user_newpass_time' => $dbw->timestampOrNull( $this->mNewpassTime ), |
| 2517 | 2517 | 'user_real_name' => $this->mRealName, |
| 2518 | | - 'user_email' => $this->mEmail, |
| 2519 | | - 'user_email_authenticated' => $dbw->timestampOrNull( $this->mEmailAuthenticated ), |
| | 2518 | + 'user_email' => $this->mEmail, |
| | 2519 | + 'user_email_authenticated' => $dbw->timestampOrNull( $this->mEmailAuthenticated ), |
| 2520 | 2520 | 'user_options' => '', |
| 2521 | 2521 | 'user_touched' => $dbw->timestamp( $this->mTouched ), |
| 2522 | 2522 | 'user_token' => $this->mToken, |
| — | — | @@ -2672,7 +2672,7 @@ |
| 2673 | 2673 | wfDeprecated( __METHOD__ ); |
| 2674 | 2674 | |
| 2675 | 2675 | // stubthreshold is only included below for completeness, |
| 2676 | | - // since it disables the parser cache, its value will always |
| | 2676 | + // since it disables the parser cache, its value will always |
| 2677 | 2677 | // be 0 when this function is called by parsercache. |
| 2678 | 2678 | |
| 2679 | 2679 | $confstr = $this->getOption( 'math' ); |
| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -1287,9 +1287,9 @@ |
| 1288 | 1288 | */ |
| 1289 | 1289 | function wfEscapeWikiText( $text ) { |
| 1290 | 1290 | $text = str_replace( |
| 1291 | | - array( '[', '|', ']', '\'', 'ISBN ', |
| | 1291 | + array( '[', '|', ']', '\'', 'ISBN ', |
| 1292 | 1292 | 'RFC ', '://', "\n=", '{{', '}}' ), |
| 1293 | | - array( '[', '|', ']', ''', 'ISBN ', |
| | 1293 | + array( '[', '|', ']', ''', 'ISBN ', |
| 1294 | 1294 | 'RFC ', '://', "\n=", '{{', '}}' ), |
| 1295 | 1295 | htmlspecialchars( $text ) |
| 1296 | 1296 | ); |
| — | — | @@ -1987,7 +1987,7 @@ |
| 1988 | 1988 | $uts = 0; |
| 1989 | 1989 | $da = array(); |
| 1990 | 1990 | $strtime = ''; |
| 1991 | | - |
| | 1991 | + |
| 1992 | 1992 | if ( $ts === 0 ) { |
| 1993 | 1993 | $uts = time(); |
| 1994 | 1994 | $strtime = "@$uts"; |
| — | — | @@ -2034,8 +2034,8 @@ |
| 2035 | 2035 | return false; |
| 2036 | 2036 | } |
| 2037 | 2037 | |
| 2038 | | - |
| 2039 | 2038 | |
| | 2039 | + |
| 2040 | 2040 | static $formats = array( |
| 2041 | 2041 | TS_UNIX => 'U', |
| 2042 | 2042 | TS_MW => 'YmdHis', |
| — | — | @@ -2058,7 +2058,7 @@ |
| 2059 | 2059 | $ds = sprintf("%04d-%02d-%02dT%02d:%02d:%02d.00+00:00", |
| 2060 | 2060 | (int)$da[1], (int)$da[2], (int)$da[3], |
| 2061 | 2061 | (int)$da[4], (int)$da[5], (int)$da[6]); |
| 2062 | | - |
| | 2062 | + |
| 2063 | 2063 | $d = date_create( $ds, new DateTimeZone( 'GMT' ) ); |
| 2064 | 2064 | } elseif ( $strtime ) { |
| 2065 | 2065 | $d = date_create( $strtime, new DateTimeZone( 'GMT' ) ); |
| — | — | @@ -2081,12 +2081,12 @@ |
| 2082 | 2082 | } elseif ( $strtime ) { |
| 2083 | 2083 | $uts = strtotime( $strtime ); |
| 2084 | 2084 | } |
| 2085 | | - |
| | 2085 | + |
| 2086 | 2086 | if ( $uts === false ) { |
| 2087 | 2087 | wfDebug("wfTimestamp() can't parse the timestamp (non 32-bit time? Update php): $outputtype; $ts\n"); |
| 2088 | 2088 | return false; |
| 2089 | 2089 | } |
| 2090 | | - |
| | 2090 | + |
| 2091 | 2091 | if ( TS_UNIX == $outputtype ) { |
| 2092 | 2092 | return $uts; |
| 2093 | 2093 | } |
| — | — | @@ -2510,7 +2510,7 @@ |
| 2511 | 2511 | * @param $cmd String Command line, properly escaped for shell. |
| 2512 | 2512 | * @param &$retval optional, will receive the program's exit code. |
| 2513 | 2513 | * (non-zero is usually failure) |
| 2514 | | - * @param $environ Array optional environment variables which should be |
| | 2514 | + * @param $environ Array optional environment variables which should be |
| 2515 | 2515 | * added to the executed command environment. |
| 2516 | 2516 | * @return collected stdout as a string (trailing newlines stripped) |
| 2517 | 2517 | */ |
| — | — | @@ -2545,22 +2545,22 @@ |
| 2546 | 2546 | $envcmd = ''; |
| 2547 | 2547 | foreach( $environ as $k => $v ) { |
| 2548 | 2548 | if ( wfIsWindows() ) { |
| 2549 | | - /* Surrounding a set in quotes (method used by wfEscapeShellArg) makes the quotes themselves |
| 2550 | | - * appear in the environment variable, so we must use carat escaping as documented in |
| 2551 | | - * http://technet.microsoft.com/en-us/library/cc723564.aspx |
| 2552 | | - * Note however that the quote isn't listed there, but is needed, and the parentheses |
| | 2549 | + /* Surrounding a set in quotes (method used by wfEscapeShellArg) makes the quotes themselves |
| | 2550 | + * appear in the environment variable, so we must use carat escaping as documented in |
| | 2551 | + * http://technet.microsoft.com/en-us/library/cc723564.aspx |
| | 2552 | + * Note however that the quote isn't listed there, but is needed, and the parentheses |
| 2553 | 2553 | * are listed there but doesn't appear to need it. |
| 2554 | 2554 | */ |
| 2555 | 2555 | $envcmd .= "set $k=" . preg_replace( '/([&|()<>^"])/', '^\\1', $v ) . ' && '; |
| 2556 | 2556 | } else { |
| 2557 | | - /* Assume this is a POSIX shell, thus required to accept variable assignments before the command |
| | 2557 | + /* Assume this is a POSIX shell, thus required to accept variable assignments before the command |
| 2558 | 2558 | * http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_09_01 |
| 2559 | 2559 | */ |
| 2560 | 2560 | $envcmd .= "$k=" . escapeshellarg( $v ) . ' '; |
| 2561 | 2561 | } |
| 2562 | 2562 | } |
| 2563 | 2563 | $cmd = $envcmd . $cmd; |
| 2564 | | - |
| | 2564 | + |
| 2565 | 2565 | if ( wfIsWindows() ) { |
| 2566 | 2566 | if ( version_compare( PHP_VERSION, '5.3.0', '<' ) && /* Fixed in 5.3.0 :) */ |
| 2567 | 2567 | ( version_compare( PHP_VERSION, '5.2.1', '>=' ) || php_uname( 's' ) == 'Windows NT' ) ) |
| — | — | @@ -3585,20 +3585,20 @@ |
| 3586 | 3586 | |
| 3587 | 3587 | /** |
| 3588 | 3588 | * Returns the PackageRepository object for interaction with the package repository. |
| 3589 | | - * |
| 3590 | | - * TODO: Make the repository type also configurable. |
| 3591 | | - * |
| | 3589 | + * |
| | 3590 | + * TODO: Make the repository type also configurable. |
| | 3591 | + * |
| 3592 | 3592 | * @since 1.17 |
| 3593 | | - * |
| | 3593 | + * |
| 3594 | 3594 | * @return PackageRepository |
| 3595 | 3595 | */ |
| 3596 | 3596 | function wfGetRepository() { |
| 3597 | 3597 | global $wgRepositoryApiLocation; |
| 3598 | 3598 | static $repository = false; |
| 3599 | | - |
| | 3599 | + |
| 3600 | 3600 | if ( $repository === false ) { |
| 3601 | 3601 | $repository = new DistributionRepository( $wgRepositoryApiLocation ); |
| 3602 | 3602 | } |
| 3603 | | - |
| | 3603 | + |
| 3604 | 3604 | return $repository; |
| 3605 | 3605 | } |
| Index: trunk/phase3/includes/Licenses.php |
| — | — | @@ -31,7 +31,7 @@ |
| 32 | 32 | */ |
| 33 | 33 | public function __construct( $params ) { |
| 34 | 34 | parent::__construct( $params ); |
| 35 | | - |
| | 35 | + |
| 36 | 36 | $this->msg = empty( $params['licenses'] ) ? wfMsgForContent( 'licenses' ) : $params['licenses']; |
| 37 | 37 | $this->selected = null; |
| 38 | 38 | |
| — | — | @@ -105,7 +105,7 @@ |
| 106 | 106 | protected function outputOption( $text, $value, $attribs = null, $depth = 0 ) { |
| 107 | 107 | $attribs['value'] = $value; |
| 108 | 108 | if ( $value === $this->selected ) |
| 109 | | - $attribs['selected'] = 'selected'; |
| | 109 | + $attribs['selected'] = 'selected'; |
| 110 | 110 | $val = str_repeat( /*   */ "\xc2\xa0", $depth * 2 ) . $text; |
| 111 | 111 | return str_repeat( "\t", $depth ) . Xml::element( 'option', $attribs, $val ) . "\n"; |
| 112 | 112 | } |
| — | — | @@ -131,18 +131,18 @@ |
| 132 | 132 | */ |
| 133 | 133 | public function getInputHTML( $value ) { |
| 134 | 134 | $this->selected = $value; |
| 135 | | - |
| | 135 | + |
| 136 | 136 | $this->html = $this->outputOption( wfMsg( 'nolicense' ), '', |
| 137 | 137 | (bool)$this->selected ? null : array( 'selected' => 'selected' ) ); |
| 138 | 138 | $this->makeHtml( $this->getLicenses() ); |
| 139 | | - |
| | 139 | + |
| 140 | 140 | $attribs = array( |
| 141 | 141 | 'name' => $this->mName, |
| 142 | 142 | 'id' => $this->mID |
| 143 | 143 | ); |
| 144 | 144 | if ( !empty( $this->mParams['disabled'] ) ) |
| 145 | 145 | $attibs['disabled'] = 'disabled'; |
| 146 | | - |
| | 146 | + |
| 147 | 147 | return Html::rawElement( 'select', $attribs, $this->html ); |
| 148 | 148 | } |
| 149 | 149 | } |
| Index: trunk/phase3/includes/installer/CoreInstaller.php |
| — | — | @@ -298,7 +298,7 @@ |
| 299 | 299 | /** |
| 300 | 300 | * Get an array of install steps. These could be a plain key like the defaults |
| 301 | 301 | * in $installSteps, or could be an array with a name and a specific callback |
| 302 | | - * There must be a config-install-$step message defined per step, which will |
| | 302 | + * There must be a config-install-$step message defined per step, which will |
| 303 | 303 | * be shown on install. |
| 304 | 304 | * |
| 305 | 305 | * @param $installer DatabaseInstaller so we can make callbacks |
| — | — | @@ -315,7 +315,7 @@ |
| 316 | 316 | array( 'name' => 'mainpage', 'callback' => array( $this, 'createMainpage' ) ), |
| 317 | 317 | ); |
| 318 | 318 | if( count( $this->getVar( '_Extensions' ) ) ) { |
| 319 | | - array_unshift( $installSteps, |
| | 319 | + array_unshift( $installSteps, |
| 320 | 320 | array( 'name' => 'extensions', 'callback' => array( $this, 'includeExtensions' ) ) |
| 321 | 321 | ); |
| 322 | 322 | } |
| — | — | @@ -374,9 +374,9 @@ |
| 375 | 375 | protected function generateSecretKey() { |
| 376 | 376 | return $this->generateSecret( 'wgSecretKey' ); |
| 377 | 377 | } |
| 378 | | - |
| | 378 | + |
| 379 | 379 | /** |
| 380 | | - * Generate a secret value for a variable using either |
| | 380 | + * Generate a secret value for a variable using either |
| 381 | 381 | * /dev/urandom or mt_rand() Produce a warning in the later case. |
| 382 | 382 | * |
| 383 | 383 | * @return Status |
| — | — | @@ -411,7 +411,7 @@ |
| 412 | 412 | } |
| 413 | 413 | |
| 414 | 414 | /** |
| 415 | | - * Generate a default $wgUpradeKey, Will warn if we had to use |
| | 415 | + * Generate a default $wgUpradeKey, Will warn if we had to use |
| 416 | 416 | * mt_rand() instead of /dev/urandom |
| 417 | 417 | * |
| 418 | 418 | * @return Status |
| — | — | @@ -453,7 +453,7 @@ |
| 454 | 454 | |
| 455 | 455 | /** |
| 456 | 456 | * Insert Main Page with default content. |
| 457 | | - * |
| | 457 | + * |
| 458 | 458 | * @return Status |
| 459 | 459 | */ |
| 460 | 460 | protected function createMainpage( DatabaseInstaller &$installer ) { |
| — | — | @@ -468,9 +468,9 @@ |
| 469 | 469 | User::newFromName( 'MediaWiki Default' ) ); |
| 470 | 470 | } catch (MWException $e) { |
| 471 | 471 | //using raw, because $wgShowExceptionDetails can not be set yet |
| 472 | | - $status->fatal( 'config-install-mainpage-failed', $e->getMessage() ); |
| | 472 | + $status->fatal( 'config-install-mainpage-failed', $e->getMessage() ); |
| 473 | 473 | } |
| 474 | | - |
| | 474 | + |
| 475 | 475 | return $status; |
| 476 | 476 | } |
| 477 | 477 | |
| Index: trunk/phase3/includes/installer/PostgresInstaller.php |
| — | — | @@ -5,7 +5,7 @@ |
| 6 | 6 | * @file |
| 7 | 7 | * @ingroup Deployment |
| 8 | 8 | */ |
| 9 | | - |
| | 9 | + |
| 10 | 10 | /** |
| 11 | 11 | * Class for setting up the MediaWiki database using Postgres. |
| 12 | 12 | * |
| Index: trunk/phase3/includes/Wiki.php |
| — | — | @@ -50,11 +50,11 @@ |
| 51 | 51 | */ |
| 52 | 52 | function performRequestForTitle( &$title, &$article, &$output, &$user, $request ) { |
| 53 | 53 | wfProfileIn( __METHOD__ ); |
| 54 | | - |
| | 54 | + |
| 55 | 55 | $output->setTitle( $title ); |
| 56 | | - |
| | 56 | + |
| 57 | 57 | wfRunHooks( 'BeforeInitialize', array( &$title, &$article, &$output, &$user, $request, $this ) ); |
| 58 | | - |
| | 58 | + |
| 59 | 59 | if( !$this->preliminaryChecks( $title, $output, $request ) ) { |
| 60 | 60 | wfProfileOut( __METHOD__ ); |
| 61 | 61 | return; |
| — | — | @@ -323,11 +323,11 @@ |
| 324 | 324 | { |
| 325 | 325 | // Give extensions a change to ignore/handle redirects as needed |
| 326 | 326 | $ignoreRedirect = $target = false; |
| 327 | | - |
| | 327 | + |
| 328 | 328 | $dbr = wfGetDB( DB_SLAVE ); |
| 329 | 329 | $article->loadPageData( $article->pageDataFromTitle( $dbr, $title ) ); |
| 330 | 330 | |
| 331 | | - wfRunHooks( 'InitializeArticleMaybeRedirect', |
| | 331 | + wfRunHooks( 'InitializeArticleMaybeRedirect', |
| 332 | 332 | array(&$title,&$request,&$ignoreRedirect,&$target,&$article) ); |
| 333 | 333 | |
| 334 | 334 | // Follow redirects only for... redirects. |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -73,7 +73,7 @@ |
| 74 | 74 | # If the port is a non-standard one, add it to the URL |
| 75 | 75 | if( isset( $_SERVER['SERVER_PORT'] ) |
| 76 | 76 | && !strpos( $serverName, ':' ) |
| 77 | | - && ( ( $wgProto == 'http' && $_SERVER['SERVER_PORT'] != 80 ) |
| | 77 | + && ( ( $wgProto == 'http' && $_SERVER['SERVER_PORT'] != 80 ) |
| 78 | 78 | || ( $wgProto == 'https' && $_SERVER['SERVER_PORT'] != 443 ) ) ) { |
| 79 | 79 | |
| 80 | 80 | $wgServer .= ":" . $_SERVER['SERVER_PORT']; |
| — | — | @@ -504,9 +504,9 @@ |
| 505 | 505 | * This is the list of preferred extensions for uploading files. Uploading files |
| 506 | 506 | * with extensions not in this list will trigger a warning. |
| 507 | 507 | * |
| 508 | | - * WARNING: If you add any OpenOffice or Microsoft Office file formats here, |
| 509 | | - * such as odt or doc, and untrusted users are allowed to upload files, then |
| 510 | | - * your wiki will be vulnerable to cross-site request forgery (CSRF). |
| | 508 | + * WARNING: If you add any OpenOffice or Microsoft Office file formats here, |
| | 509 | + * such as odt or doc, and untrusted users are allowed to upload files, then |
| | 510 | + * your wiki will be vulnerable to cross-site request forgery (CSRF). |
| 511 | 511 | */ |
| 512 | 512 | $wgFileExtensions = array( 'png', 'gif', 'jpg', 'jpeg' ); |
| 513 | 513 | |
| — | — | @@ -544,7 +544,7 @@ |
| 545 | 545 | 'application/x-opc+zip', |
| 546 | 546 | ); |
| 547 | 547 | |
| 548 | | -/** |
| | 548 | +/** |
| 549 | 549 | * This is a flag to determine whether or not to check file extensions on upload. |
| 550 | 550 | * |
| 551 | 551 | * WARNING: setting this to false is insecure for public wikis. |
| — | — | @@ -555,7 +555,7 @@ |
| 556 | 556 | * If this is turned off, users may override the warning for files not covered |
| 557 | 557 | * by $wgFileExtensions. |
| 558 | 558 | * |
| 559 | | - * WARNING: setting this to false is insecure for public wikis. |
| | 559 | + * WARNING: setting this to false is insecure for public wikis. |
| 560 | 560 | */ |
| 561 | 561 | $wgStrictFileExtensions = true; |
| 562 | 562 | |
| — | — | @@ -2300,7 +2300,7 @@ |
| 2301 | 2301 | */ |
| 2302 | 2302 | |
| 2303 | 2303 | /** |
| 2304 | | - * Client-side resource modules. Extensions should add their module definitions |
| | 2304 | + * Client-side resource modules. Extensions should add their module definitions |
| 2305 | 2305 | * here. |
| 2306 | 2306 | * |
| 2307 | 2307 | * Example: |
| — | — | @@ -2331,8 +2331,8 @@ |
| 2332 | 2332 | ); |
| 2333 | 2333 | |
| 2334 | 2334 | /** |
| 2335 | | - * Whether to embed private modules inline with HTML output or to bypass |
| 2336 | | - * caching and check the user parameter against $wgUser to prevent |
| | 2335 | + * Whether to embed private modules inline with HTML output or to bypass |
| | 2336 | + * caching and check the user parameter against $wgUser to prevent |
| 2337 | 2337 | * unauthorized access to private modules. |
| 2338 | 2338 | */ |
| 2339 | 2339 | $wgResourceLoaderInlinePrivateModules = true; |
| Index: trunk/phase3/includes/IP.php |
| — | — | @@ -599,7 +599,7 @@ |
| 600 | 600 | // IPv6 loopback address |
| 601 | 601 | $m = array(); |
| 602 | 602 | if ( preg_match( '/^0*' . RE_IPV6_GAP . '1$/', $addr, $m ) ) { |
| 603 | | - return '127.0.0.1'; |
| | 603 | + return '127.0.0.1'; |
| 604 | 604 | } |
| 605 | 605 | // IPv4-mapped and IPv4-compatible IPv6 addresses |
| 606 | 606 | if ( preg_match( '/^' . RE_IPV6_V4_PREFIX . '(' . RE_IP_ADD . ')$/i', $addr, $m ) ) { |