| Index: branches/REL1_17/extensions/ExtensionDistributor/ExtensionDistributor_body.php |
| — | — | @@ -259,7 +259,7 @@ |
| 260 | 260 | htmlspecialchars( wfMsg( 'extdist-want-more' ) ) . '</a></big></p>' ); |
| 261 | 261 | |
| 262 | 262 | // Redirect to the file |
| 263 | | - header( 'Refresh: 5;' . $url ); |
| | 263 | + header( 'Refresh: 5;url=' . $url ); |
| 264 | 264 | } |
| 265 | 265 | |
| 266 | 266 | protected function updateAndGetRevisionLocal( $extension, $version ) { |
| Index: branches/REL1_17/extensions/ContributionReporting/ContributionReporting.php |
| — | — | @@ -96,8 +96,11 @@ |
| 97 | 97 | $egFundraiserStatisticsMinimum = 1; |
| 98 | 98 | $egFundraiserStatisticsMaximum = 10000; |
| 99 | 99 | |
| | 100 | +// Cache timeout for fundraiser statistics, in seconds |
| | 101 | +$egFundraiserStatisticsCacheTimeout = 300; // 5 minutes |
| 100 | 102 | |
| 101 | 103 | |
| | 104 | + |
| 102 | 105 | $wgContributionTrackingStatisticsViewWeeks = 3; |
| 103 | 106 | |
| 104 | 107 | $wgHooks['ParserFirstCallInit'][] = 'efContributionReportingSetup'; |
| Index: branches/REL1_17/extensions/ContributionReporting/FundraiserStatistics_body.php |
| — | — | @@ -217,7 +217,7 @@ |
| 218 | 218 | /* Private Functions */ |
| 219 | 219 | |
| 220 | 220 | private function query( $type, $start, $end ) { |
| 221 | | - global $wgMemc, $egFundraiserStatisticsMinimum, $egFundraiserStatisticsMaximum; |
| | 221 | + global $wgMemc, $egFundraiserStatisticsMinimum, $egFundraiserStatisticsMaximum, $egFundraiserStatisticsCacheTimeout; |
| 222 | 222 | |
| 223 | 223 | $key = wfMemcKey( 'fundraiserstatistics', $type, $start, $end ); |
| 224 | 224 | $cache = $wgMemc->get( $key ); |
| — | — | @@ -309,8 +309,7 @@ |
| 310 | 310 | break; |
| 311 | 311 | } |
| 312 | 312 | if ( isset( $result ) ) { |
| 313 | | - // Cache invalidates once per minute |
| 314 | | - $wgMemc->set( $key, $result, 60 ); |
| | 313 | + $wgMemc->set( $key, $result, $egFundraiserStatisticsCacheTimeout ); |
| 315 | 314 | return $result; |
| 316 | 315 | } |
| 317 | 316 | return null; |
| Index: branches/REL1_17/phase3/skins/Vector.php |
| — | — | @@ -305,6 +305,8 @@ |
| 306 | 306 | 'text' => wfMsg( 'nstab-special' ), |
| 307 | 307 | 'href' => $wgRequest->getRequestURL() |
| 308 | 308 | ); |
| | 309 | + // Equiv to SkinTemplateBuildContentActionUrlsAfterSpecialPage |
| | 310 | + wfRunHooks( 'SkinTemplateNavigation::SpecialPage', array( &$this, &$links ) ); |
| 309 | 311 | } |
| 310 | 312 | |
| 311 | 313 | // Gets list of language variants |
| — | — | @@ -331,6 +333,9 @@ |
| 332 | 334 | } |
| 333 | 335 | } |
| 334 | 336 | |
| | 337 | + // Equiv to SkinTemplateContentActions |
| | 338 | + wfRunHooks( 'SkinTemplateNavigation::Universal', array( &$this, &$links ) ); |
| | 339 | + |
| 335 | 340 | wfProfileOut( __METHOD__ ); |
| 336 | 341 | |
| 337 | 342 | return $links; |
| Property changes on: branches/REL1_17/phase3/skins/Vector.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 338 | 343 | Merged /trunk/phase3/skins/Vector.php:r78078,78285,79246,79358,79480 |
| Index: branches/REL1_17/phase3/docs/hooks.txt |
| — | — | @@ -1489,7 +1489,10 @@ |
| 1490 | 1490 | [See http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/examples/Content_action.php |
| 1491 | 1491 | for an example] |
| 1492 | 1492 | |
| 1493 | | -'SkinTemplateNavigation': Alter the structured navigation links in SkinTemplates |
| | 1493 | +Alter the structured navigation links in SkinTemplates, there are three of these hooks called in different spots. |
| | 1494 | +'SkinTemplateNavigation': Called on content pages before variants have been added |
| | 1495 | +'SkinTemplateNavigation::SpecialPage': Called on special pages before variands have been added |
| | 1496 | +'SkinTemplateNavigation::Universal': Called on both content and special pages after variants have been added |
| 1494 | 1497 | &$sktemplate: SkinTemplate object |
| 1495 | 1498 | &$links: Structured navigation links |
| 1496 | 1499 | This is used to alter the navigation for skins which use buildNavigationUrls such as Vector. |
| Property changes on: branches/REL1_17/phase3/docs/hooks.txt |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1497 | 1500 | Merged /trunk/phase3/docs/hooks.txt:r78078,79246,79358,79480 |
| Index: branches/REL1_17/phase3/includes/upload/UploadBase.php |
| — | — | @@ -568,10 +568,9 @@ |
| 569 | 569 | if ( $this->mFinalExtension == '' ) { |
| 570 | 570 | $this->mTitleError = self::FILETYPE_MISSING; |
| 571 | 571 | return $this->mTitle = null; |
| 572 | | - } elseif ( ( $this->checkFileExtensionList( $ext, $wgFileBlacklist ) |
| 573 | | - && !$this->checkFileExtensionList( $ext, $wgFileExtensions ) ) || |
| 574 | | - ( $wgCheckFileExtensions && $wgStrictFileExtensions && |
| 575 | | - !$this->checkFileExtension( $this->mFinalExtension, $wgFileExtensions ) ) ) { |
| | 572 | + } elseif ( $this->checkFileExtensionList( $ext, $wgFileBlacklist ) || |
| | 573 | + ( $wgCheckFileExtensions && $wgStrictFileExtensions && |
| | 574 | + !$this->checkFileExtension( $this->mFinalExtension, $wgFileExtensions ) ) ) { |
| 576 | 575 | $this->mTitleError = self::FILETYPE_BADTYPE; |
| 577 | 576 | return $this->mTitle = null; |
| 578 | 577 | } |
| Property changes on: branches/REL1_17/phase3/includes/upload/UploadBase.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 579 | 578 | Merged /trunk/phase3/includes/upload/UploadBase.php:r78078,78285,79246,79358,79480,79693 |
| Index: branches/REL1_17/phase3/includes/Setup.php |
| — | — | @@ -293,6 +293,9 @@ |
| 294 | 294 | $wgCacheEpoch = max( $wgCacheEpoch, gmdate( 'YmdHis', @filemtime( "$IP/LocalSettings.php" ) ) ); |
| 295 | 295 | } |
| 296 | 296 | |
| | 297 | +# Blacklisted file extensions shouldn't appear on the "allowed" list |
| | 298 | +$wgFileExtensions = array_diff ( $wgFileExtensions, $wgFileBlacklist ); |
| | 299 | + |
| 297 | 300 | wfProfileOut( $fname.'-misc1' ); |
| 298 | 301 | wfProfileIn( $fname.'-memcached' ); |
| 299 | 302 | |
| Index: branches/REL1_17/phase3/includes/installer/MysqlUpdater.php |
| — | — | @@ -191,7 +191,7 @@ |
| 192 | 192 | $this->output( "...$table table has correct $field encoding.\n" ); |
| 193 | 193 | } else { |
| 194 | 194 | $this->output( "Fixing $field encoding on $table table... " ); |
| 195 | | - $this->db->applyPatch( $patchFile ); |
| | 195 | + $this->applyPatch( $patchFile ); |
| 196 | 196 | $this->output( "ok\n" ); |
| 197 | 197 | } |
| 198 | 198 | } |
| — | — | @@ -311,6 +311,7 @@ |
| 312 | 312 | $this->output( wfTimestamp( TS_DB ) ); |
| 313 | 313 | $this->output( "......<b>Found duplicate entries</b>\n" ); |
| 314 | 314 | $this->output( sprintf( "<b> %-60s %3s %5s</b>\n", 'Title', 'NS', 'Count' ) ); |
| | 315 | + $duplicate = array(); |
| 315 | 316 | foreach ( $rows as $row ) { |
| 316 | 317 | if ( ! isset( $duplicate[$row->cur_namespace] ) ) { |
| 317 | 318 | $duplicate[$row->cur_namespace] = array(); |
| — | — | @@ -617,13 +618,17 @@ |
| 618 | 619 | * @see bug 3946 |
| 619 | 620 | */ |
| 620 | 621 | protected function doPageRandomUpdate() { |
| 621 | | - $this->output( "Setting page_random to a random value on rows where it equals 0..." ); |
| | 622 | + |
| 622 | 623 | |
| 623 | 624 | $page = $this->db->tableName( 'page' ); |
| 624 | 625 | $this->db->query( "UPDATE $page SET page_random = RAND() WHERE page_random = 0", __METHOD__ ); |
| 625 | 626 | $rows = $this->db->affectedRows(); |
| 626 | 627 | |
| 627 | | - $this->output( "changed $rows rows\n" ); |
| | 628 | + if( $rows ) { |
| | 629 | + $this->output( "Set page_random to a random value on $rows rows where it was set to 0\n" ); |
| | 630 | + } else { |
| | 631 | + $this->output( "...no page_random rows needed to be set\n" ); |
| | 632 | + } |
| 628 | 633 | } |
| 629 | 634 | |
| 630 | 635 | protected function doTemplatelinksUpdate() { |
| Property changes on: branches/REL1_17/phase3/includes/installer/MysqlUpdater.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 631 | 636 | Merged /branches/REL1_15/phase3/includes/installer/MysqlUpdater.php:r51646 |
| 632 | 637 | Merged /branches/sqlite/includes/installer/MysqlUpdater.php:r58211-58321 |
| 633 | 638 | Merged /trunk/phase3/includes/installer/MysqlUpdater.php:r78078,78285,79246,79358,79480-79481,79693 |
| 634 | 639 | Merged /branches/new-installer/phase3/includes/installer/MysqlUpdater.php:r43664-66004 |
| 635 | 640 | Merged /branches/wmf-deployment/includes/installer/MysqlUpdater.php:r53381 |
| Index: branches/REL1_17/phase3/includes/installer/CoreInstaller.php |
| — | — | @@ -259,7 +259,7 @@ |
| 260 | 260 | * Overridden by WebInstaller to provide lastPage parameters. |
| 261 | 261 | */ |
| 262 | 262 | protected function getDocUrl( $page ) { |
| 263 | | - return "{$_SERVER['PHP_SELF']}?page=" . urlencode( $attribs['href'] ); |
| | 263 | + return "{$_SERVER['PHP_SELF']}?page=" . urlencode( $page ); |
| 264 | 264 | } |
| 265 | 265 | |
| 266 | 266 | /** |
| Property changes on: branches/REL1_17/phase3/includes/installer/CoreInstaller.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 267 | 267 | Merged /branches/sqlite/includes/installer/CoreInstaller.php:r58211-58321 |
| 268 | 268 | Merged /trunk/phase3/includes/installer/CoreInstaller.php:r78078,78285,79246,79358,79480,79491,79693 |
| 269 | 269 | Merged /branches/new-installer/phase3/includes/installer/CoreInstaller.php:r43664-66004 |
| 270 | 270 | Merged /branches/wmf-deployment/includes/installer/CoreInstaller.php:r53381 |
| 271 | 271 | Merged /branches/REL1_15/phase3/includes/installer/CoreInstaller.php:r51646 |
| Index: branches/REL1_17/phase3/includes/installer/DatabaseInstaller.php |
| — | — | @@ -131,7 +131,7 @@ |
| 132 | 132 | |
| 133 | 133 | $error = $this->db->sourceFile( $this->db->getSchema() ); |
| 134 | 134 | if( $error !== true ) { |
| 135 | | - $this->db->reportQueryError( $error, 0, $sql, __METHOD__ ); |
| | 135 | + $this->db->reportQueryError( $error, 0, '', __METHOD__ ); |
| 136 | 136 | $status->fatal( 'config-install-tables-failed', $error ); |
| 137 | 137 | } |
| 138 | 138 | return $status; |
| Property changes on: branches/REL1_17/phase3/includes/installer/DatabaseInstaller.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 139 | 139 | Merged /trunk/phase3/includes/installer/DatabaseInstaller.php:r78078,78285,79246,79358,79480,79497,79693 |
| Index: branches/REL1_17/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -1042,7 +1042,7 @@ |
| 1043 | 1043 | // Pop up a dialog box, to make it difficult for the user to forget |
| 1044 | 1044 | // to download the file |
| 1045 | 1045 | $lsUrl = $GLOBALS['wgServer'] . $this->parent->getURL( array( 'localsettings' => 1 ) ); |
| 1046 | | - $this->parent->request->response()->header( "Refresh: 0;$lsUrl" ); |
| | 1046 | + $this->parent->request->response()->header( "Refresh: 0;url=$lsUrl" ); |
| 1047 | 1047 | |
| 1048 | 1048 | $this->startForm(); |
| 1049 | 1049 | $this->parent->disableLinkPopups(); |
| Property changes on: branches/REL1_17/phase3/includes/installer/WebInstallerPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1050 | 1050 | Merged /trunk/phase3/includes/installer/WebInstallerPage.php:r78078,78285,79246,79358,79480,79503,79693 |
| Index: branches/REL1_17/phase3/includes/resourceloader/ResourceLoader.php |
| — | — | @@ -533,7 +533,7 @@ |
| 534 | 534 | 'mediaWiki.loader.implement', |
| 535 | 535 | array( |
| 536 | 536 | $name, |
| 537 | | - new XmlJsCode( "function() {{$scripts}}" ), |
| | 537 | + new XmlJsCode( "function( $, mw ) {{$scripts}}" ), |
| 538 | 538 | (object)$styles, |
| 539 | 539 | (object)$messages |
| 540 | 540 | ) ); |
| Property changes on: branches/REL1_17/phase3/includes/resourceloader/ResourceLoader.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 541 | 541 | Merged /trunk/phase3/includes/resourceloader/ResourceLoader.php:r78078,78285,79246,79358,79480,79693 |
| Index: branches/REL1_17/phase3/RELEASE-NOTES |
| — | — | @@ -234,6 +234,8 @@ |
| 235 | 235 | other than LocalSettings.php. This is like MW_CONFIG_CALLBACK but works in |
| 236 | 236 | some cases where MW_CONFIG_CALLBACK will not work. |
| 237 | 237 | * (bug 16019) $wgArticlePath = "/$1" no longer breaks API edit/watch actions |
| | 238 | +* (bug 18372) File types blacklisted by $wgFileBlacklist will no longer be shown as "Permitted file types" on the upload form |
| | 239 | +* (bug 26540) Fixed wrong call to applyPatch in MysqlUpdater |
| 238 | 240 | |
| 239 | 241 | === Bug fixes in 1.17 === |
| 240 | 242 | * (bug 17560) Half-broken deletion moved image files to deletion archive |
| — | — | @@ -477,6 +479,8 @@ |
| 478 | 480 | * (bug 14404) The articles are now always saved with the default options. Articles |
| 479 | 481 | with {{int:X}} will have consistent table links no matter the preferences of the |
| 480 | 482 | last saving user. |
| | 483 | +* (bug 22753) Output from update.php is more clear when things changed, entries |
| | 484 | + indicating nothing changed are now all prefixed by "..." |
| 481 | 485 | |
| 482 | 486 | === API changes in 1.17 === |
| 483 | 487 | * BREAKING CHANGE: action=patrol now requires POST |
| Index: branches/REL1_17/phase3/resources/mediawiki/mediawiki.js |
| — | — | @@ -502,7 +502,7 @@ |
| 503 | 503 | } |
| 504 | 504 | // Execute script |
| 505 | 505 | try { |
| 506 | | - registry[module].script(); |
| | 506 | + registry[module].script( jQuery, mediaWiki ); |
| 507 | 507 | registry[module].state = 'ready'; |
| 508 | 508 | // Run jobs who's dependencies have just been met |
| 509 | 509 | for ( var j = 0; j < jobs.length; j++ ) { |
| Property changes on: branches/REL1_17/phase3/resources/mediawiki/mediawiki.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 510 | 510 | Merged /trunk/phase3/resources/mediawiki/mediawiki.js:r78078,78285,79246,79358,79480 |