| Index: branches/wmf/1.19wmf1/RELEASE-NOTES-1.19 |
| — | — | @@ -10,6 +10,14 @@ |
| 11 | 11 | MediaWiki 1.19 is an alpha-quality branch and is not recommended for use in |
| 12 | 12 | production. |
| 13 | 13 | |
| | 14 | +=== Changes since 1.19 beta 1 === |
| | 15 | +* (bug 35014) Including a special page no longer sets the page's title to the |
| | 16 | + included page |
| | 17 | +* (bug 35152) Help message for e-mail is shown again in user preferences |
| | 18 | +* (bug 34887) $3 and $4 parameters are now substituted correctly in message |
| | 19 | + "movepage-moved" |
| | 20 | +* (bug 34841) Edit links are no longer displayed when display old page versions |
| | 21 | + |
| 14 | 22 | === Configuration changes in 1.19 === |
| 15 | 23 | * Removed SkinTemplateSetupPageCss hook; use BeforePageDisplay instead. |
| 16 | 24 | * (bug 27132) movefile right granted by default to registered users. |
| — | — | @@ -250,6 +258,8 @@ |
| 251 | 259 | * (bug 34600) Older skins using useHeadElement=false were broken in 1.18 |
| 252 | 260 | * (bug 34604) [mw.config] wgActionPaths should be an object instead of a numeral |
| 253 | 261 | array. |
| | 262 | +* (bug 29753) mw.util.tooltipAccessKeyPrefix should be alt-shift for Chrome on Windows |
| | 263 | +* (bug 25095) Special:Categories doesn't show first relevant item when "from" is filled. |
| 254 | 264 | |
| 255 | 265 | === API changes in 1.19 === |
| 256 | 266 | * Made action=edit less likely to return "unknownerror", by returning the actual error |
| Index: branches/wmf/1.19wmf1/includes/Article.php |
| — | — | @@ -451,7 +451,7 @@ |
| 452 | 452 | if ( $wgOut->isPrintable() ) { |
| 453 | 453 | $parserOptions->setIsPrintable( true ); |
| 454 | 454 | $parserOptions->setEditSection( false ); |
| 455 | | - } elseif ( !$this->getTitle()->quickUserCan( 'edit' ) ) { |
| | 455 | + } elseif ( !$this->isCurrent() || !$this->getTitle()->quickUserCan( 'edit' ) ) { |
| 456 | 456 | $parserOptions->setEditSection( false ); |
| 457 | 457 | } |
| 458 | 458 | |
| Index: branches/wmf/1.19wmf1/includes/OutputPage.php |
| — | — | @@ -2839,6 +2839,10 @@ |
| 2840 | 2840 | $ns = $title->getNamespace(); |
| 2841 | 2841 | $nsname = MWNamespace::exists( $ns ) ? MWNamespace::getCanonicalName( $ns ) : $title->getNsText(); |
| 2842 | 2842 | |
| | 2843 | + // Get the relevant title so that AJAX features can use the correct page name |
| | 2844 | + // when making API requests from certain special pages (bug 34972). |
| | 2845 | + $relevantTitle = $this->getSkin()->getRelevantTitle(); |
| | 2846 | + |
| 2843 | 2847 | if ( $ns == NS_SPECIAL ) { |
| 2844 | 2848 | list( $canonicalName, /*...*/ ) = SpecialPageFactory::resolveAlias( $title->getDBkey() ); |
| 2845 | 2849 | } elseif ( $this->canUseWikiPage() ) { |
| — | — | @@ -2880,6 +2884,7 @@ |
| 2881 | 2885 | 'wgPageContentLanguage' => $lang->getCode(), |
| 2882 | 2886 | 'wgSeparatorTransformTable' => $compactSeparatorTransTable, |
| 2883 | 2887 | 'wgDigitTransformTable' => $compactDigitTransTable, |
| | 2888 | + 'wgRelevantPageName' => $relevantTitle->getPrefixedDBKey(), |
| 2884 | 2889 | ); |
| 2885 | 2890 | if ( $wgContLang->hasVariants() ) { |
| 2886 | 2891 | $vars['wgUserVariant'] = $wgContLang->getPreferredVariant(); |
| — | — | @@ -3432,7 +3437,7 @@ |
| 3433 | 3438 | * @param $args array |
| 3434 | 3439 | */ |
| 3435 | 3440 | public function addWikiMsgArray( $name, $args ) { |
| 3436 | | - $this->addWikiText( $this->msg( $name, $args )->plain() ); |
| | 3441 | + $this->addHTML( $this->msg( $name, $args )->parseAsBlock() ); |
| 3437 | 3442 | } |
| 3438 | 3443 | |
| 3439 | 3444 | /** |
| Property changes on: branches/wmf/1.19wmf1/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3440 | 3445 | Merged /trunk/phase3/includes/OutputPage.php:r113394,113415,113617,113710,113727,113737,113816 |
| Index: branches/wmf/1.19wmf1/includes/specials/SpecialNewpages.php |
| — | — | @@ -356,7 +356,14 @@ |
| 357 | 357 | |
| 358 | 358 | $css = count( $classes ) ? ' class="' . implode( ' ', $classes ) . '"' : ''; |
| 359 | 359 | |
| 360 | | - return "<li{$css}>{$time} {$dm}{$plink} {$hist} {$dm}{$length} {$dm}{$ulink} {$comment} {$tagDisplay}</li>\n"; |
| | 360 | + # Display the old title if the namespace has been changed |
| | 361 | + $oldTitleText = ''; |
| | 362 | + if ( $result->page_namespace !== $result->rc_namespace ) { |
| | 363 | + $oldTitleText = wfMessage( 'rc-old-title' )->params( Title::makeTitle( $result->rc_namespace, $result->rc_title ) |
| | 364 | + ->getPrefixedText() )->escaped(); |
| | 365 | + } |
| | 366 | + |
| | 367 | + return "<li{$css}>{$time} {$dm}{$plink} {$hist} {$dm}{$length} {$dm}{$ulink} {$comment} {$tagDisplay} {$oldTitleText}</li>\n"; |
| 361 | 368 | } |
| 362 | 369 | |
| 363 | 370 | /** |
| Index: branches/wmf/1.19wmf1/includes/specials/SpecialCategories.php |
| — | — | @@ -59,12 +59,16 @@ |
| 60 | 60 | * @ingroup SpecialPage Pager |
| 61 | 61 | */ |
| 62 | 62 | class CategoryPager extends AlphabeticPager { |
| | 63 | + private $conds = array( 'cat_pages > 0' ); |
| | 64 | + |
| 63 | 65 | function __construct( IContextSource $context, $from ) { |
| 64 | 66 | parent::__construct( $context ); |
| 65 | 67 | $from = str_replace( ' ', '_', $from ); |
| 66 | 68 | if( $from !== '' ) { |
| 67 | 69 | $from = Title::capitalize( $from, NS_CATEGORY ); |
| 68 | | - $this->mOffset = $from; |
| | 70 | + $dbr = wfGetDB( DB_SLAVE ); |
| | 71 | + $this->conds[] = 'cat_title >= ' . $dbr->addQuotes( $from ); |
| | 72 | + $this->setOffset( '' ); |
| 69 | 73 | } |
| 70 | 74 | } |
| 71 | 75 | |
| — | — | @@ -72,7 +76,7 @@ |
| 73 | 77 | return array( |
| 74 | 78 | 'tables' => array( 'category' ), |
| 75 | 79 | 'fields' => array( 'cat_title','cat_pages' ), |
| 76 | | - 'conds' => array( 'cat_pages > 0' ), |
| | 80 | + 'conds' => $this->conds, |
| 77 | 81 | 'options' => array( 'USE INDEX' => 'cat_title' ), |
| 78 | 82 | ); |
| 79 | 83 | } |
| Index: branches/wmf/1.19wmf1/includes/specials/SpecialMovepage.php |
| — | — | @@ -472,7 +472,8 @@ |
| 473 | 473 | $newText = $nt->getPrefixedText(); |
| 474 | 474 | |
| 475 | 475 | $msgName = $createRedirect ? 'movepage-moved-redirect' : 'movepage-moved-noredirect'; |
| 476 | | - $out->addHTML( wfMessage( 'movepage-moved' )->rawParams( $oldLink, $newLink, $oldText, $newText )->parseAsBlock() ); |
| | 476 | + $out->addHTML( wfMessage( 'movepage-moved' )->rawParams( $oldLink, |
| | 477 | + $newLink )->params( $oldText, $newText )->parseAsBlock() ); |
| 477 | 478 | $out->addWikiMsg( $msgName ); |
| 478 | 479 | |
| 479 | 480 | # Now we move extra pages we've been asked to move: subpages and talk |
| Property changes on: branches/wmf/1.19wmf1/includes/specials/SpecialMovepage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 480 | 481 | Merged /trunk/phase3/includes/specials/SpecialMovepage.php:r113727,113737,113816 |
| Property changes on: branches/wmf/1.19wmf1/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 481 | 482 | Merged /trunk/phase3/includes/specials:r112918,113214,113394,113415,113617,113710,113727,113737,113816 |
| Index: branches/wmf/1.19wmf1/includes/Preferences.php |
| — | — | @@ -360,6 +360,7 @@ |
| 361 | 361 | 'default' => $emailAddress, |
| 362 | 362 | 'label-message' => 'youremail', |
| 363 | 363 | 'section' => 'personal/email', |
| | 364 | + 'help-messages' => $helpMessages, |
| 364 | 365 | ); |
| 365 | 366 | |
| 366 | 367 | $disableEmailPrefs = false; |
| Property changes on: branches/wmf/1.19wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 367 | 368 | Merged /trunk/phase3/includes:r112918,113214,113394,113415,113617,113710,113727,113737,113816 |
| Index: branches/wmf/1.19wmf1/languages/messages/MessagesQqq.php |
| — | — | @@ -1789,6 +1789,7 @@ |
| 1790 | 1790 | Does not work under $wgMiserMode ([[mwr:48986|r48986]]).', |
| 1791 | 1791 | 'rc-change-size-new' => 'Tooltip when overing a change list diff size. The tooltip show the resulting new size in bytes.', |
| 1792 | 1792 | 'newsectionsummary' => 'Default summary when adding a new section to a page.', |
| | 1793 | +'rc-old-title' => 'Text that shows the original title of a page, $1 is the original title text', |
| 1793 | 1794 | |
| 1794 | 1795 | # Recent changes linked |
| 1795 | 1796 | 'recentchangeslinked' => 'Title of [[Special:RecentChangesLinked]] and display name of page on [[Special:SpecialPages]].', |
| Index: branches/wmf/1.19wmf1/languages/messages/MessagesEn.php |
| — | — | @@ -2066,6 +2066,7 @@ |
| 2067 | 2067 | 'newsectionsummary' => '/* $1 */ new section', |
| 2068 | 2068 | 'rc-enhanced-expand' => 'Show details (requires JavaScript)', |
| 2069 | 2069 | 'rc-enhanced-hide' => 'Hide details', |
| | 2070 | +'rc-old-title' => 'originally created as "$1"', |
| 2070 | 2071 | |
| 2071 | 2072 | # Recent changes linked |
| 2072 | 2073 | 'recentchangeslinked' => 'Related changes', |
| Property changes on: branches/wmf/1.19wmf1/languages |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2073 | 2074 | Merged /trunk/phase3/languages:r112918,113214,113394,113415,113617,113710,113727,113737,113816 |
| Index: branches/wmf/1.19wmf1/resources/mediawiki.action/mediawiki.action.watch.ajax.js |
| — | — | @@ -5,6 +5,11 @@ |
| 6 | 6 | ( function ( $, mw, undefined ) { |
| 7 | 7 | |
| 8 | 8 | /** |
| | 9 | + * The name of the page to watch or unwatch. |
| | 10 | + */ |
| | 11 | +var title = mw.config.get( 'wgRelevantPageName', mw.config.get( 'wgPageName' ) ); |
| | 12 | + |
| | 13 | +/** |
| 9 | 14 | * Update the link text, link href attribute and (if applicable) |
| 10 | 15 | * "loading" class. |
| 11 | 16 | * |
| — | — | @@ -24,7 +29,7 @@ |
| 25 | 30 | ( accesskeyTip ? ' ' + accesskeyTip[0] : '' ) |
| 26 | 31 | ) |
| 27 | 32 | .attr( 'href', mw.util.wikiScript() + '?' + $.param({ |
| 28 | | - title: mw.config.get( 'wgPageName' ), |
| | 33 | + title: title, |
| 29 | 34 | action: action |
| 30 | 35 | }) |
| 31 | 36 | ); |
| — | — | @@ -98,7 +103,7 @@ |
| 99 | 104 | |
| 100 | 105 | api = new mw.Api(); |
| 101 | 106 | api[action]( |
| 102 | | - mw.config.get( 'wgPageName' ), |
| | 107 | + title, |
| 103 | 108 | // Success |
| 104 | 109 | function( watchResponse ) { |
| 105 | 110 | var otherAction = action === 'watch' ? 'unwatch' : 'watch', |
| — | — | @@ -129,10 +134,10 @@ |
| 130 | 135 | updateWatchLink( $link, action ); |
| 131 | 136 | |
| 132 | 137 | // Format error message |
| 133 | | - var cleanTitle = mw.config.get( 'wgPageName' ).replace( /_/g, ' ' ); |
| | 138 | + var cleanTitle = title.replace( /_/g, ' ' ); |
| 134 | 139 | var link = mw.html.element( |
| 135 | 140 | 'a', { |
| 136 | | - 'href': mw.util.wikiGetlink( mw.config.get( 'wgPageName' ) ), |
| | 141 | + 'href': mw.util.wikiGetlink( title ), |
| 137 | 142 | 'title': cleanTitle |
| 138 | 143 | }, cleanTitle |
| 139 | 144 | ); |
| Index: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.util.js |
| — | — | @@ -29,9 +29,17 @@ |
| 30 | 30 | |
| 31 | 31 | // Chrome on any platform |
| 32 | 32 | } else if ( profile.name === 'chrome' ) { |
| 33 | | - // Chrome on Mac or Chrome on other platform ? |
| 34 | | - util.tooltipAccessKeyPrefix = ( profile.platform === 'mac' |
| 35 | | - ? 'ctrl-option-' : 'alt-' ); |
| | 33 | + |
| | 34 | + util.tooltipAccessKeyPrefix = ( |
| | 35 | + // Chrome on Mac |
| | 36 | + profile.platform === 'mac' ? 'ctrl-option-' : |
| | 37 | + // Chrome on Windows |
| | 38 | + // (both alt- and alt-shift work, but alt-f triggers Chrome wrench menu |
| | 39 | + // which alt-shift-f does not) |
| | 40 | + profile.platform === 'win' ? 'alt-shift-' : |
| | 41 | + // Chrome on Ubuntu (and other?) |
| | 42 | + 'alt-' |
| | 43 | + ); |
| 36 | 44 | |
| 37 | 45 | // Non-Windows Safari with webkit_version > 526 |
| 38 | 46 | } else if ( profile.platform !== 'win' |
| Index: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.js |
| — | — | @@ -586,11 +586,12 @@ |
| 587 | 587 | filter( 'ready', jobs[j].dependencies ), |
| 588 | 588 | jobs[j].dependencies ) ) |
| 589 | 589 | { |
| 590 | | - if ( $.isFunction( jobs[j].ready ) ) { |
| 591 | | - jobs[j].ready(); |
| 592 | | - } |
| | 590 | + var callback = jobs[j].ready; |
| 593 | 591 | jobs.splice( j, 1 ); |
| 594 | 592 | j -= 1; |
| | 593 | + if ( $.isFunction( callback ) ) { |
| | 594 | + callback(); |
| | 595 | + } |
| 595 | 596 | } |
| 596 | 597 | } |
| 597 | 598 | // Execute modules whose dependencies have just been met |
| Property changes on: branches/wmf/1.19wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 598 | 599 | Merged /trunk/phase3:r112918,113214,113394,113415,113617,113710,113727,113737,113816 |