https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113935
Revision: 113935
Author: reedy
Date: 2012-03-15 17:27:04 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
MFT r112918, r113214, r113394, r113415, r113617, r113710, r113727, r113737,
r113816
Modified Paths:
--------------
branches/wmf/1.19wmf1/RELEASE-NOTES-1.19
branches/wmf/1.19wmf1/includes/Article.php
branches/wmf/1.19wmf1/includes/OutputPage.php
branches/wmf/1.19wmf1/includes/Preferences.php
branches/wmf/1.19wmf1/includes/specials/SpecialCategories.php
branches/wmf/1.19wmf1/includes/specials/SpecialMovepage.php
branches/wmf/1.19wmf1/includes/specials/SpecialNewpages.php
branches/wmf/1.19wmf1/languages/messages/MessagesEn.php
branches/wmf/1.19wmf1/languages/messages/MessagesQqq.php
branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.js
branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.util.js
branches/wmf/1.19wmf1/resources/mediawiki.action/mediawiki.action.watch.ajax.js
Property Changed:
----------------
branches/wmf/1.19wmf1/
branches/wmf/1.19wmf1/includes/
branches/wmf/1.19wmf1/includes/OutputPage.php
branches/wmf/1.19wmf1/includes/specials/
branches/wmf/1.19wmf1/includes/specials/SpecialMovepage.php
branches/wmf/1.19wmf1/languages/
Property changes on: branches/wmf/1.19wmf1
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111427,111571,111574,111597,111647,111658,111673,111695,111697,111750,111795,111802-111803,111827,111881,111920,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169-112170,112172-112173,112179,112184,112259,112290,112347,112374,112378,112381,112383,112397,112408,112474,112526,112533-112534,112563,112566,112573,112700,112750,112839-112840,112843,112855,112866,112951,112995,113039,113085,113099,113169,113195,113312,113412,113775
+ /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111427,111571,111574,111597,111647,111658,111673,111695,111697,111750,111795,111802-111803,111827,111881,111920,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169-112170,112172-112173,112179,112184,112259,112290,112347,112374,112378,112381,112383,112397,112408,112474,112526,112533-112534,112563,112566,112573,112700,112750,112839-112840,112843,112855,112866,112918,112951,112995,113039,113085,113099,113169,113195,113214,113312,113394,113412,113415,113617,113710,113727,113737,113775,113816
Modified: branches/wmf/1.19wmf1/RELEASE-NOTES-1.19
===================================================================
--- branches/wmf/1.19wmf1/RELEASE-NOTES-1.19 2012-03-15 17:14:28 UTC (rev
113934)
+++ branches/wmf/1.19wmf1/RELEASE-NOTES-1.19 2012-03-15 17:27:04 UTC (rev
113935)
@@ -10,6 +10,14 @@
MediaWiki 1.19 is an alpha-quality branch and is not recommended for use in
production.
+=== Changes since 1.19 beta 1 ===
+* (bug 35014) Including a special page no longer sets the page's title to the
+ included page
+* (bug 35152) Help message for e-mail is shown again in user preferences
+* (bug 34887) $3 and $4 parameters are now substituted correctly in message
+ "movepage-moved"
+* (bug 34841) Edit links are no longer displayed when display old page versions
+
=== Configuration changes in 1.19 ===
* Removed SkinTemplateSetupPageCss hook; use BeforePageDisplay instead.
* (bug 27132) movefile right granted by default to registered users.
@@ -250,6 +258,8 @@
* (bug 34600) Older skins using useHeadElement=false were broken in 1.18
* (bug 34604) [mw.config] wgActionPaths should be an object instead of a
numeral
array.
+* (bug 29753) mw.util.tooltipAccessKeyPrefix should be alt-shift for Chrome on
Windows
+* (bug 25095) Special:Categories doesn't show first relevant item when "from"
is filled.
=== API changes in 1.19 ===
* Made action=edit less likely to return "unknownerror", by returning the
actual error
Property changes on: branches/wmf/1.19wmf1/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111427,111571,111574,111597,111647,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133,112152,112184,112259,112290,112347,112374,112378,112381,112383,112397,112408,112474,112526,112534,112563,112700,112839-112840,112843,112855,112866,112951,112995,113099,113169,113195,113312,113412,113441
+ /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111427,111571,111574,111597,111647,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133,112152,112184,112259,112290,112347,112374,112378,112381,112383,112397,112408,112474,112526,112534,112563,112700,112839-112840,112843,112855,112866,112918,112951,112995,113099,113169,113195,113214,113312,113394,113412,113415,113441,113617,113710,113727,113737,113816
Modified: branches/wmf/1.19wmf1/includes/Article.php
===================================================================
--- branches/wmf/1.19wmf1/includes/Article.php 2012-03-15 17:14:28 UTC (rev
113934)
+++ branches/wmf/1.19wmf1/includes/Article.php 2012-03-15 17:27:04 UTC (rev
113935)
@@ -451,7 +451,7 @@
if ( $wgOut->isPrintable() ) {
$parserOptions->setIsPrintable( true );
$parserOptions->setEditSection( false );
- } elseif ( !$this->getTitle()->quickUserCan( 'edit' ) ) {
+ } elseif ( !$this->isCurrent() ||
!$this->getTitle()->quickUserCan( 'edit' ) ) {
$parserOptions->setEditSection( false );
}
Modified: branches/wmf/1.19wmf1/includes/OutputPage.php
===================================================================
--- branches/wmf/1.19wmf1/includes/OutputPage.php 2012-03-15 17:14:28 UTC
(rev 113934)
+++ branches/wmf/1.19wmf1/includes/OutputPage.php 2012-03-15 17:27:04 UTC
(rev 113935)
@@ -2839,6 +2839,10 @@
$ns = $title->getNamespace();
$nsname = MWNamespace::exists( $ns ) ?
MWNamespace::getCanonicalName( $ns ) : $title->getNsText();
+ // Get the relevant title so that AJAX features can use the
correct page name
+ // when making API requests from certain special pages (bug
34972).
+ $relevantTitle = $this->getSkin()->getRelevantTitle();
+
if ( $ns == NS_SPECIAL ) {
list( $canonicalName, /*...*/ ) =
SpecialPageFactory::resolveAlias( $title->getDBkey() );
} elseif ( $this->canUseWikiPage() ) {
@@ -2880,6 +2884,7 @@
'wgPageContentLanguage' => $lang->getCode(),
'wgSeparatorTransformTable' =>
$compactSeparatorTransTable,
'wgDigitTransformTable' => $compactDigitTransTable,
+ 'wgRelevantPageName' =>
$relevantTitle->getPrefixedDBKey(),
);
if ( $wgContLang->hasVariants() ) {
$vars['wgUserVariant'] =
$wgContLang->getPreferredVariant();
@@ -3432,7 +3437,7 @@
* @param $args array
*/
public function addWikiMsgArray( $name, $args ) {
- $this->addWikiText( $this->msg( $name, $args )->plain() );
+ $this->addHTML( $this->msg( $name, $args )->parseAsBlock() );
}
/**
Property changes on: branches/wmf/1.19wmf1/includes/OutputPage.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes/OutputPage.php:100352-107913
/branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/REL1_17/phase3/includes/OutputPage.php:81445
/branches/resourceloader/phase3/includes/OutputPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/wmf-deployment/includes/OutputPage.php:53381,57468
/trunk/phase3/includes/OutputPage.php:111029,111034,111067,111085,111128,111144,111597,113127
+ /branches/JSTesting/includes/OutputPage.php:100352-107913
/branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/REL1_17/phase3/includes/OutputPage.php:81445
/branches/resourceloader/phase3/includes/OutputPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/wmf-deployment/includes/OutputPage.php:53381,57468
/trunk/phase3/includes/OutputPage.php:111029,111034,111067,111085,111128,111144,111597,113127,113394,113415,113617,113710,113727,113737,113816
Modified: branches/wmf/1.19wmf1/includes/Preferences.php
===================================================================
--- branches/wmf/1.19wmf1/includes/Preferences.php 2012-03-15 17:14:28 UTC
(rev 113934)
+++ branches/wmf/1.19wmf1/includes/Preferences.php 2012-03-15 17:27:04 UTC
(rev 113935)
@@ -360,6 +360,7 @@
'default' => $emailAddress,
'label-message' => 'youremail',
'section' => 'personal/email',
+ 'help-messages' => $helpMessages,
);
$disableEmailPrefs = false;
Property changes on: branches/wmf/1.19wmf1/includes/specials
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes/specials:100352-107913
/branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
/trunk/phase3/includes/specials:111085,111128,111144,111251,111750,112397,112408,112474,112843,112995,113099,113169
+ /branches/JSTesting/includes/specials:100352-107913
/branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
/trunk/phase3/includes/specials:111085,111128,111144,111251,111750,112397,112408,112474,112843,112918,112995,113099,113169,113214,113394,113415,113617,113710,113727,113737,113816
Modified: branches/wmf/1.19wmf1/includes/specials/SpecialCategories.php
===================================================================
--- branches/wmf/1.19wmf1/includes/specials/SpecialCategories.php
2012-03-15 17:14:28 UTC (rev 113934)
+++ branches/wmf/1.19wmf1/includes/specials/SpecialCategories.php
2012-03-15 17:27:04 UTC (rev 113935)
@@ -59,12 +59,16 @@
* @ingroup SpecialPage Pager
*/
class CategoryPager extends AlphabeticPager {
+ private $conds = array( 'cat_pages > 0' );
+
function __construct( IContextSource $context, $from ) {
parent::__construct( $context );
$from = str_replace( ' ', '_', $from );
if( $from !== '' ) {
$from = Title::capitalize( $from, NS_CATEGORY );
- $this->mOffset = $from;
+ $dbr = wfGetDB( DB_SLAVE );
+ $this->conds[] = 'cat_title >= ' . $dbr->addQuotes(
$from );
+ $this->setOffset( '' );
}
}
@@ -72,7 +76,7 @@
return array(
'tables' => array( 'category' ),
'fields' => array( 'cat_title','cat_pages' ),
- 'conds' => array( 'cat_pages > 0' ),
+ 'conds' => $this->conds,
'options' => array( 'USE INDEX' => 'cat_title' ),
);
}
Modified: branches/wmf/1.19wmf1/includes/specials/SpecialMovepage.php
===================================================================
--- branches/wmf/1.19wmf1/includes/specials/SpecialMovepage.php 2012-03-15
17:14:28 UTC (rev 113934)
+++ branches/wmf/1.19wmf1/includes/specials/SpecialMovepage.php 2012-03-15
17:27:04 UTC (rev 113935)
@@ -472,7 +472,8 @@
$newText = $nt->getPrefixedText();
$msgName = $createRedirect ? 'movepage-moved-redirect' :
'movepage-moved-noredirect';
- $out->addHTML( wfMessage( 'movepage-moved' )->rawParams(
$oldLink, $newLink, $oldText, $newText )->parseAsBlock() );
+ $out->addHTML( wfMessage( 'movepage-moved' )->rawParams(
$oldLink,
+ $newLink )->params( $oldText, $newText
)->parseAsBlock() );
$out->addWikiMsg( $msgName );
# 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
- /branches/JSTesting/includes/specials/SpecialMovepage.php:100352-107913
/branches/REL1_15/phase3/includes/specials/SpecialMovepage.php:51646
/branches/sqlite/includes/specials/SpecialMovepage.php:58211-58321
/branches/wmf-deployment/includes/specials/SpecialMovepage.php:53381,56967
/trunk/phase3/includes/specials/SpecialMovepage.php:111085,111128,111144,111251,112569
+ /branches/JSTesting/includes/specials/SpecialMovepage.php:100352-107913
/branches/REL1_15/phase3/includes/specials/SpecialMovepage.php:51646
/branches/sqlite/includes/specials/SpecialMovepage.php:58211-58321
/branches/wmf-deployment/includes/specials/SpecialMovepage.php:53381,56967
/trunk/phase3/includes/specials/SpecialMovepage.php:111085,111128,111144,111251,112569,113727,113737,113816
Modified: branches/wmf/1.19wmf1/includes/specials/SpecialNewpages.php
===================================================================
--- branches/wmf/1.19wmf1/includes/specials/SpecialNewpages.php 2012-03-15
17:14:28 UTC (rev 113934)
+++ branches/wmf/1.19wmf1/includes/specials/SpecialNewpages.php 2012-03-15
17:27:04 UTC (rev 113935)
@@ -356,7 +356,14 @@
$css = count( $classes ) ? ' class="' . implode( ' ', $classes
) . '"' : '';
- return "<li{$css}>{$time} {$dm}{$plink} {$hist} {$dm}{$length}
{$dm}{$ulink} {$comment} {$tagDisplay}</li>\n";
+ # Display the old title if the namespace has been changed
+ $oldTitleText = '';
+ if ( $result->page_namespace !== $result->rc_namespace ) {
+ $oldTitleText = wfMessage( 'rc-old-title' )->params(
Title::makeTitle( $result->rc_namespace, $result->rc_title )
+
->getPrefixedText() )->escaped();
+ }
+
+ return "<li{$css}>{$time} {$dm}{$plink} {$hist} {$dm}{$length}
{$dm}{$ulink} {$comment} {$tagDisplay} {$oldTitleText}</li>\n";
}
/**
Property changes on: branches/wmf/1.19wmf1/languages
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/languages:100352-107913
/branches/REL1_15/phase3/languages:51646
/branches/REL1_17/phase3/languages:81445,81448
/branches/new-installer/phase3/languages:43664-66004
/branches/nikola/phase3/languages:85224,85239,85308
/branches/sqlite/languages:58211-58321
/trunk/phase3/languages:112049,112061-112063,112065-112066,112070-112071,112128
+ /branches/JSTesting/languages:100352-107913
/branches/REL1_15/phase3/languages:51646
/branches/REL1_17/phase3/languages:81445,81448
/branches/new-installer/phase3/languages:43664-66004
/branches/nikola/phase3/languages:85224,85239,85308
/branches/sqlite/languages:58211-58321
/trunk/phase3/languages:112049,112061-112063,112065-112066,112070-112071,112128,112918,113214,113394,113415,113617,113710,113727,113737,113816
Modified: branches/wmf/1.19wmf1/languages/messages/MessagesEn.php
===================================================================
--- branches/wmf/1.19wmf1/languages/messages/MessagesEn.php 2012-03-15
17:14:28 UTC (rev 113934)
+++ branches/wmf/1.19wmf1/languages/messages/MessagesEn.php 2012-03-15
17:27:04 UTC (rev 113935)
@@ -2066,6 +2066,7 @@
'newsectionsummary' => '/* $1 */ new section',
'rc-enhanced-expand' => 'Show details (requires JavaScript)',
'rc-enhanced-hide' => 'Hide details',
+'rc-old-title' => 'originally created as "$1"',
# Recent changes linked
'recentchangeslinked' => 'Related changes',
Modified: branches/wmf/1.19wmf1/languages/messages/MessagesQqq.php
===================================================================
--- branches/wmf/1.19wmf1/languages/messages/MessagesQqq.php 2012-03-15
17:14:28 UTC (rev 113934)
+++ branches/wmf/1.19wmf1/languages/messages/MessagesQqq.php 2012-03-15
17:27:04 UTC (rev 113935)
@@ -1789,6 +1789,7 @@
Does not work under $wgMiserMode ([[mwr:48986|r48986]]).',
'rc-change-size-new' => 'Tooltip when overing a change list diff
size. The tooltip show the resulting new size in bytes.',
'newsectionsummary' => 'Default summary when adding a new
section to a page.',
+'rc-old-title' => 'Text that shows the original title of a
page, $1 is the original title text',
# Recent changes linked
'recentchangeslinked' => 'Title of [[Special:RecentChangesLinked]] and
display name of page on [[Special:SpecialPages]].',
Modified: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.js
===================================================================
--- branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.js 2012-03-15
17:14:28 UTC (rev 113934)
+++ branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.js 2012-03-15
17:27:04 UTC (rev 113935)
@@ -586,11 +586,12 @@
filter( 'ready',
jobs[j].dependencies ),
jobs[j].dependencies ) )
{
- if ( $.isFunction(
jobs[j].ready ) ) {
- jobs[j].ready();
- }
+ var callback =
jobs[j].ready;
jobs.splice( j, 1 );
j -= 1;
+ if ( $.isFunction(
callback ) ) {
+ callback();
+ }
}
}
// Execute modules whose dependencies
have just been met
Modified: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.util.js
===================================================================
--- branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.util.js 2012-03-15
17:14:28 UTC (rev 113934)
+++ branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.util.js 2012-03-15
17:27:04 UTC (rev 113935)
@@ -29,9 +29,17 @@
// Chrome on any platform
} else if ( profile.name === 'chrome' ) {
- // Chrome on Mac or Chrome on other platform ?
- util.tooltipAccessKeyPrefix = (
profile.platform === 'mac'
- ? 'ctrl-option-' : 'alt-' );
+
+ util.tooltipAccessKeyPrefix = (
+ // Chrome on Mac
+ profile.platform === 'mac' ?
'ctrl-option-' :
+ // Chrome on Windows
+ // (both alt- and alt-shift work, but
alt-f triggers Chrome wrench menu
+ // which alt-shift-f does not)
+ profile.platform === 'win' ?
'alt-shift-' :
+ // Chrome on Ubuntu (and other?)
+ 'alt-'
+ );
// Non-Windows Safari with webkit_version > 526
} else if ( profile.platform !== 'win'
Modified:
branches/wmf/1.19wmf1/resources/mediawiki.action/mediawiki.action.watch.ajax.js
===================================================================
---
branches/wmf/1.19wmf1/resources/mediawiki.action/mediawiki.action.watch.ajax.js
2012-03-15 17:14:28 UTC (rev 113934)
+++
branches/wmf/1.19wmf1/resources/mediawiki.action/mediawiki.action.watch.ajax.js
2012-03-15 17:27:04 UTC (rev 113935)
@@ -5,6 +5,11 @@
( function ( $, mw, undefined ) {
/**
+ * The name of the page to watch or unwatch.
+ */
+var title = mw.config.get( 'wgRelevantPageName', mw.config.get( 'wgPageName' )
);
+
+/**
* Update the link text, link href attribute and (if applicable)
* "loading" class.
*
@@ -24,7 +29,7 @@
( accesskeyTip ? ' ' + accesskeyTip[0] : '' )
)
.attr( 'href', mw.util.wikiScript() + '?' + $.param({
- title: mw.config.get( 'wgPageName' ),
+ title: title,
action: action
})
);
@@ -98,7 +103,7 @@
api = new mw.Api();
api[action](
- mw.config.get( 'wgPageName' ),
+ title,
// Success
function( watchResponse ) {
var otherAction = action === 'watch' ?
'unwatch' : 'watch',
@@ -129,10 +134,10 @@
updateWatchLink( $link, action );
// Format error message
- var cleanTitle = mw.config.get( 'wgPageName'
).replace( /_/g, ' ' );
+ var cleanTitle = title.replace( /_/g, ' ' );
var link = mw.html.element(
'a', {
- 'href': mw.util.wikiGetlink(
mw.config.get( 'wgPageName' ) ),
+ 'href': mw.util.wikiGetlink(
title ),
'title': cleanTitle
}, cleanTitle
);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
