| Index: trunk/phase3/maintenance/namespaceDupes.php |
| — | — | @@ -26,6 +26,12 @@ |
| 27 | 27 | require_once( dirname( __FILE__ ) . '/Maintenance.php' ); |
| 28 | 28 | |
| 29 | 29 | class NamespaceConflictChecker extends Maintenance { |
| | 30 | + |
| | 31 | + /** |
| | 32 | + * @var DatabaseBase |
| | 33 | + */ |
| | 34 | + protected $db; |
| | 35 | + |
| 30 | 36 | public function __construct() { |
| 31 | 37 | parent::__construct(); |
| 32 | 38 | $this->mDescription = ""; |
| — | — | @@ -183,6 +189,8 @@ |
| 184 | 190 | * |
| 185 | 191 | * @param $ns Integer: namespace id (id for new namespace?) |
| 186 | 192 | * @param $name String: prefix that is being made a namespace |
| | 193 | + * |
| | 194 | + * @return array |
| 187 | 195 | */ |
| 188 | 196 | private function getConflicts( $ns, $name ) { |
| 189 | 197 | $page = 'page'; |
| — | — | @@ -217,6 +225,8 @@ |
| 218 | 226 | |
| 219 | 227 | /** |
| 220 | 228 | * Report any conflicts we find |
| | 229 | + * |
| | 230 | + * @return bool |
| 221 | 231 | */ |
| 222 | 232 | private function reportConflict( $row, $suffix ) { |
| 223 | 233 | $newTitle = Title::makeTitleSafe( $row->namespace, $row->title ); |
| Index: trunk/phase3/RELEASE-NOTES-1.19 |
| — | — | @@ -76,7 +76,7 @@ |
| 77 | 77 | warnings/notices to be thrown. |
| 78 | 78 | * (bug 30335) Fix for HTMLForms using GET breaking when non-friendly URLs are |
| 79 | 79 | used |
| 80 | | -* (bug 28649) Avoiding half truncated multi-byte unicode characters when |
| | 80 | +* (bug 28649) Avoiding half truncated multi-byte unicode characters when |
| 81 | 81 | truncating log comments. |
| 82 | 82 | * Show --batch-size option in help of maintenance scripts that support it |
| 83 | 83 | * (bug 4381) Magic quotes cleaning was not comprehensive, key strings were not |
| Index: trunk/phase3/includes/logging/LogFormatter.php |
| — | — | @@ -56,7 +56,9 @@ |
| 57 | 57 | |
| 58 | 58 | // Nonstatic-> |
| 59 | 59 | |
| 60 | | - /// @var LogEntry |
| | 60 | + /** |
| | 61 | + * @var LogEntry |
| | 62 | + */ |
| 61 | 63 | protected $entry; |
| 62 | 64 | |
| 63 | 65 | /// Whether to output user tool links |
| Index: trunk/phase3/includes/api/ApiMain.php |
| — | — | @@ -428,7 +428,7 @@ |
| 429 | 429 | return; |
| 430 | 430 | } // else no XVO and anonymous, send public headers below |
| 431 | 431 | } |
| 432 | | - |
| | 432 | + |
| 433 | 433 | // Send public headers |
| 434 | 434 | if ( $wgVaryOnXFPForAPI ) { |
| 435 | 435 | $response->header( 'Vary: Accept-Encoding, X-Forwarded-Proto' ); |
| Index: trunk/phase3/includes/specials/SpecialUserlogin.php |
| — | — | @@ -377,7 +377,7 @@ |
| 378 | 378 | return false; |
| 379 | 379 | } |
| 380 | 380 | |
| 381 | | - // Hook point to check for exempt from account creation throttle |
| | 381 | + // Hook point to check for exempt from account creation throttle |
| 382 | 382 | if ( !wfRunHooks( 'exemptFromAccountCreationThrottle', array( $ip ) ) ) { |
| 383 | 383 | wfDebug( "LoginForm::exemptFromAccountCreationThrottle: a hook allowed account creation w/o throttle\n" ); |
| 384 | 384 | } else { |
| — | — | @@ -780,7 +780,6 @@ |
| 781 | 781 | * @param $emailTitle String: message name of email title |
| 782 | 782 | * @param $emailText String: message name of email text |
| 783 | 783 | * @return Status object |
| 784 | | - * @private |
| 785 | 784 | */ |
| 786 | 785 | function mailPasswordInternal( $u, $throttle = true, $emailTitle = 'passwordremindertitle', $emailText = 'passwordremindertext' ) { |
| 787 | 786 | global $wgServer, $wgScript, $wgUser, $wgNewPasswordExpiry, $wgRequest; |
| Index: trunk/extensions/MetricsReporting/ApiAnalyticsBase.php |
| — | — | @@ -29,7 +29,7 @@ |
| 30 | 30 | 'password' => $wgMetricsDBpassword, |
| 31 | 31 | 'dbname' => $wgMetricsDBname, |
| 32 | 32 | 'tablePrefix' => $wgMetricsDBprefix, |
| 33 | | - 'flags' => ( $wgDebugDumpSql ? DBO_DEBUG : 0 ) | DBO_DEFAULT |
| | 33 | + 'flags' => ( $wgDebugDumpSql ? DBO_DEBUG : 0 ) | DBO_DEFAULT, |
| 34 | 34 | ) |
| 35 | 35 | ); |
| 36 | 36 | //$this->mDb->query( "SET names utf8" ); |
| Index: trunk/extensions/ClickTracking/modules/ext.UserBuckets.js |
| — | — | @@ -2,7 +2,7 @@ |
| 3 | 3 | //lazy-load |
| 4 | 4 | $.getBuckets = function (force){ |
| 5 | 5 | if ( typeof $.userBuckets == 'undefined' || force ){ |
| 6 | | - $.userBuckets = $.parseJSON( $.cookie('userbuckets') ); |
| | 6 | + $.userBuckets = $.parseJSON( $.cookie('userbuckets') ); |
| 7 | 7 | } |
| 8 | 8 | return $.userBuckets; |
| 9 | 9 | }; |
| — | — | @@ -26,21 +26,21 @@ |
| 27 | 27 | if ( campaign.all ){ |
| 28 | 28 | campaign.all(); |
| 29 | 29 | } |
| 30 | | - |
| | 30 | + |
| 31 | 31 | if ( campaign.preferences && !campaign.preferences.setBuckets ) { |
| 32 | 32 | continue; |
| 33 | 33 | } |
| 34 | | - |
| | 34 | + |
| 35 | 35 | if ( !buckets || !buckets[campaign.name] || buckets[campaign.name][1] < campaign.version){ |
| 36 | 36 | // Add up all rates |
| 37 | 37 | var bucketTotal = 0; |
| 38 | 38 | for ( var rate in campaign.rates ){ |
| 39 | 39 | bucketTotal += campaign.rates[rate]; |
| 40 | 40 | } |
| 41 | | - |
| | 41 | + |
| 42 | 42 | // Give the user a random number in those rates |
| 43 | 43 | var currentUser = Math.floor( Math.random() * (bucketTotal+1) ); |
| 44 | | - |
| | 44 | + |
| 45 | 45 | // recurse through the rates until we get into the range the user falls in, |
| 46 | 46 | // assign them to that range |
| 47 | 47 | var prev_val = -1; |
| — | — | @@ -54,13 +54,13 @@ |
| 55 | 55 | prev_val = next_val; |
| 56 | 56 | } |
| 57 | 57 | } |
| 58 | | - |
| | 58 | + |
| 59 | 59 | // Execute the actual code in the campaign based on the bucket |
| 60 | 60 | if ( $.getBuckets() && $.getBuckets()[campaign.name] ) { |
| 61 | 61 | |
| 62 | 62 | var campaignBucket = $.getBuckets()[campaign.name][0]; |
| 63 | 63 | if ( campaignBucket != 'none' ) { |
| 64 | | - |
| | 64 | + |
| 65 | 65 | // Function to execute |
| 66 | 66 | var func = campaign[campaignBucket]; |
| 67 | 67 | if ( $.isFunction( func ) ) { |
| — | — | @@ -71,9 +71,9 @@ |
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | | - |
| | 75 | + |
| 76 | 76 | } |
| 77 | | - |
| | 77 | + |
| 78 | 78 | }; |
| 79 | 79 | |
| 80 | 80 | // No need to do any of this if there are no active campaigns |
| — | — | @@ -81,5 +81,4 @@ |
| 82 | 82 | $( $.setupActiveBuckets ); |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | | - |
| 86 | 85 | } )( jQuery ); |
| Index: trunk/extensions/UploadWizard/UploadWizard.php |
| — | — | @@ -28,8 +28,6 @@ |
| 29 | 29 | 'url' => 'http://www.mediawiki.org/wiki/Extension:UploadWizard' |
| 30 | 30 | ); |
| 31 | 31 | |
| 32 | | - |
| 33 | | - |
| 34 | 32 | $wgUpwizDir = dirname( __FILE__ ); |
| 35 | 33 | |
| 36 | 34 | $wgExtensionMessagesFiles['UploadWizard'] = $wgUpwizDir . '/UploadWizard.i18n.php'; |
| — | — | @@ -80,7 +78,7 @@ |
| 81 | 79 | $wgGroupPermissions['sysop' ]['upwizcampaigns'] = true; |
| 82 | 80 | $wgGroupPermissions['upwizcampeditors']['upwizcampaigns'] = true; |
| 83 | 81 | |
| 84 | | -// Init the upload wizard config array |
| | 82 | +// Init the upload wizard config array |
| 85 | 83 | // UploadWizard.config.php includes default configuration |
| 86 | 84 | // any value can be modified in localSettings.php by setting $wgUploadWizardConfig['name'] = 'value; |
| 87 | 85 | $wgUploadWizardConfig = array(); |
| Index: trunk/extensions/CodeReview/backend/DiffHighlighter.php |
| — | — | @@ -35,7 +35,7 @@ |
| 36 | 36 | * @return string |
| 37 | 37 | */ |
| 38 | 38 | function render( $text, CodeRepository $repo = null, CodeRevision $rev = null ) { |
| 39 | | - if( $repo xor $rev ) { |
| | 39 | + if( $repo ^ $rev ) { |
| 40 | 40 | throw new MWException( __METHOD__ . " must have both repository and revision or none of them\n" ); |
| 41 | 41 | } elseif( $repo && $rev ) { |
| 42 | 42 | $this->repo = $repo; |