https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114015
Revision: 114015
Author: reedy
Date: 2012-03-16 15:18:19 +0000 (Fri, 16 Mar 2012)
Log Message:
-----------
MFT r112918, r113214, r113268, r113277, r113312, r113415, r113454, r113737,
r113758, r113775, r113892
Modified Paths:
--------------
branches/REL1_19/phase3/RELEASE-NOTES-1.19
branches/REL1_19/phase3/includes/OutputPage.php
branches/REL1_19/phase3/includes/filerepo/file/LocalFile.php
branches/REL1_19/phase3/includes/resourceloader/ResourceLoaderModule.php
branches/REL1_19/phase3/includes/resourceloader/ResourceLoaderWikiModule.php
branches/REL1_19/phase3/includes/specials/SpecialCategories.php
branches/REL1_19/phase3/includes/specials/SpecialNewpages.php
branches/REL1_19/phase3/includes/specials/SpecialUndelete.php
branches/REL1_19/phase3/languages/messages/MessagesEn.php
branches/REL1_19/phase3/languages/messages/MessagesQqq.php
branches/REL1_19/phase3/resources/jquery/jquery.textSelection.js
branches/REL1_19/phase3/resources/mediawiki/mediawiki.util.js
branches/REL1_19/phase3/resources/mediawiki.action/mediawiki.action.watch.ajax.js
Property Changed:
----------------
branches/REL1_19/phase3/
branches/REL1_19/phase3/includes/
branches/REL1_19/phase3/includes/OutputPage.php
branches/REL1_19/phase3/includes/specials/
branches/REL1_19/phase3/languages/
Property changes on: branches/REL1_19/phase3
___________________________________________________________________
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,111380,111427,111478,111571,111574,111580,111597,111647,111658,111673,111695,111697,111795,111809,111832,111881,111920,111983,112021,112034,112037,112045-112046,112049,112061,112066,112079,112128,112152,112169-112170,112172-112173,112179,112184,112290,112313,112347,112374,112383-112384,112400,112408,112451,112456,112474,112526,112533-112534,112538,112563,112566-112567,112573,112700,112750,112838,112855,112872-112873,112988,112995,113001,113024,113039,113046,113085,113099,113169,113171,113195,113211
+ /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,111380,111427,111478,111571,111574,111580,111597,111647,111658,111673,111695,111697,111795,111809,111832,111881,111920,111983,112021,112034,112037,112045-112046,112049,112061,112066,112079,112128,112152,112169-112170,112172-112173,112179,112184,112290,112313,112347,112374,112383-112384,112400,112408,112451,112456,112474,112526,112533-112534,112538,112563,112566-112567,112573,112700,112750,112838,112855,112872-112873,112918,112988,112995,113001,113024,113039,113046,113085,113099,113169,113171,113195,113211,113214,113268,113277,113312,113415,113454,113737,113758,113775,113892
Modified: branches/REL1_19/phase3/RELEASE-NOTES-1.19
===================================================================
--- branches/REL1_19/phase3/RELEASE-NOTES-1.19 2012-03-16 14:48:02 UTC (rev
114014)
+++ branches/REL1_19/phase3/RELEASE-NOTES-1.19 2012-03-16 15:18:19 UTC (rev
114015)
@@ -271,8 +271,13 @@
* (bug 28936, bug 5280) Broken or invalid titles can't be removed from
watchlist.
* (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 12262) Indents and lists are now aligned
+ array.* (bug 12262) Indents and lists are now aligned
+* (bug 29753) mw.util.tooltipAccessKeyPrefix should be alt-shift for Chrome
+ on Windows
+* (bug 25095) Special:Categories should also include the first relevant item
+ when "from" is filled.
+* (bug 34972) An error occurred while changing your watchlist settings for
+ [[Special:WhatLinksHere/Example]]
=== API changes in 1.19 ===
* Made action=edit less likely to return "unknownerror", by returning the
actual error
@@ -309,6 +314,8 @@
calling action=purge&forcelinkupdate.
* (bug 34377) action=watch now parses messages using the correct title instead
of "API".
+* (bug 35036) WikiLove messages were not automatically updated in JavaScript
+ after having been changed on-wiki due to a bug in core
=== Languages updated in 1.19 ===
Property changes on: branches/REL1_19/phase3/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,111380,111427,111571,111574,111597,111647,111658,111673,111695,111697,111809,111832,111983,112021,112034,112037,112045-112046,112049,112061,112066,112079,112128,112152,112184,112290,112313,112347,112374,112383,112408,112451,112456,112474,112526,112533-112534,112538,112563,112566-112567,112700,112750,112838,112855,112872-112873,112988,112995,113001,113024,113039,113046,113099,113169,113171,113195,113211
+ /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,111380,111427,111571,111574,111597,111647,111658,111673,111695,111697,111809,111832,111983,112021,112034,112037,112045-112046,112049,112061,112066,112079,112128,112152,112184,112290,112313,112347,112374,112383,112408,112451,112456,112474,112526,112533-112534,112538,112563,112566-112567,112700,112750,112838,112855,112872-112873,112918,112988,112995,113001,113024,113039,113046,113099,113169,113171,113195,113211,113214,113268,113277,113312,113415,113454,113737,113758,113892
Modified: branches/REL1_19/phase3/includes/OutputPage.php
===================================================================
--- branches/REL1_19/phase3/includes/OutputPage.php 2012-03-16 14:48:02 UTC
(rev 114014)
+++ branches/REL1_19/phase3/includes/OutputPage.php 2012-03-16 15:18:19 UTC
(rev 114015)
@@ -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 ( $lang->hasVariants() ) {
$vars['wgUserVariant'] = $lang->getPreferredVariant();
Property changes on: branches/REL1_19/phase3/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,111658
+ /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,111658,113737,113758
Modified: branches/REL1_19/phase3/includes/filerepo/file/LocalFile.php
===================================================================
--- branches/REL1_19/phase3/includes/filerepo/file/LocalFile.php
2012-03-16 14:48:02 UTC (rev 114014)
+++ branches/REL1_19/phase3/includes/filerepo/file/LocalFile.php
2012-03-16 15:18:19 UTC (rev 114015)
@@ -907,7 +907,10 @@
$this->lock(); // begin
$status = $this->publish( $srcPath, $flags );
- if ( $status->ok ) {
+ if ( $status->successCount > 0 ) {
+ # Essentially we are displacing any existing current
file and saving
+ # a new current file at the old location. If just the
first succeeded,
+ # we still need to displace the current DB entry and
put in a new one.
if ( !$this->recordUpload2( $status->value, $comment,
$pageText, $props, $timestamp, $user ) ) {
$status->fatal( 'filenotfound', $srcPath );
}
@@ -1004,8 +1007,12 @@
);
if ( $dbw->affectedRows() == 0 ) {
- if ( $oldver == '' ) {
- throw new MWException( "Empty oi_archive_name.
Database and storage out of sync?" );
+ if ( $oldver == '' ) { // XXX
+ # (bug 34993) publish() can displace the
current file and yet fail to save
+ # a new one. The next publish attempt will
treat the file as a brand new file
+ # and pass an empty $oldver. Allow this bogus
value so we can displace the
+ # `image` row to `oldimage`, leaving room for
the new current file `image` row.
+ #throw new MWException( "Empty oi_archive_name.
Database and storage out of sync?" );
}
$reupload = true;
# Collision, this is an update of a file
Modified:
branches/REL1_19/phase3/includes/resourceloader/ResourceLoaderModule.php
===================================================================
--- branches/REL1_19/phase3/includes/resourceloader/ResourceLoaderModule.php
2012-03-16 14:48:02 UTC (rev 114014)
+++ branches/REL1_19/phase3/includes/resourceloader/ResourceLoaderModule.php
2012-03-16 15:18:19 UTC (rev 114015)
@@ -357,6 +357,10 @@
* timestamps. Whenever anything happens that changes the module's
* contents for these parameters, the mtime should increase.
*
+ * NOTE: The mtime of the module's messages is NOT automatically
included.
+ * If you want this to happen, you'll need to call getMsgBlobMtime()
+ * yourself and take its result into consideration.
+ *
* @param $context ResourceLoaderContext: Context object
* @return Integer: UNIX timestamp
*/
Modified:
branches/REL1_19/phase3/includes/resourceloader/ResourceLoaderWikiModule.php
===================================================================
---
branches/REL1_19/phase3/includes/resourceloader/ResourceLoaderWikiModule.php
2012-03-16 14:48:02 UTC (rev 114014)
+++
branches/REL1_19/phase3/includes/resourceloader/ResourceLoaderWikiModule.php
2012-03-16 15:18:19 UTC (rev 114015)
@@ -157,6 +157,7 @@
if ( count( $mtimes ) ) {
$modifiedTime = max( $modifiedTime, max( $mtimes ) );
}
+ $modifiedTime = max( $modifiedTime, $this->getMsgBlobMtime(
$context->getLanguage() ) );
return $modifiedTime;
}
Property changes on: branches/REL1_19/phase3/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,112872-112873,112988,112995,113001,113024,113039,113046,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,112872-112873,112918,112988,112995,113001,113024,113039,113046,113099,113169,113214,113268,113277,113312,113415,113454,113737,113758,113892
Modified: branches/REL1_19/phase3/includes/specials/SpecialCategories.php
===================================================================
--- branches/REL1_19/phase3/includes/specials/SpecialCategories.php
2012-03-16 14:48:02 UTC (rev 114014)
+++ branches/REL1_19/phase3/includes/specials/SpecialCategories.php
2012-03-16 15:18:19 UTC (rev 114015)
@@ -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/REL1_19/phase3/includes/specials/SpecialNewpages.php
===================================================================
--- branches/REL1_19/phase3/includes/specials/SpecialNewpages.php
2012-03-16 14:48:02 UTC (rev 114014)
+++ branches/REL1_19/phase3/includes/specials/SpecialNewpages.php
2012-03-16 15:18:19 UTC (rev 114015)
@@ -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";
}
/**
Modified: branches/REL1_19/phase3/includes/specials/SpecialUndelete.php
===================================================================
--- branches/REL1_19/phase3/includes/specials/SpecialUndelete.php
2012-03-16 14:48:02 UTC (rev 114014)
+++ branches/REL1_19/phase3/includes/specials/SpecialUndelete.php
2012-03-16 15:18:19 UTC (rev 114015)
@@ -405,13 +405,12 @@
$article->loadPageData( 'fromdbmaster' );
$oldcountable = $article->isCountable();
- $options = 'FOR UPDATE'; // lock page
$page = $dbw->selectRow( 'page',
array( 'page_id', 'page_latest' ),
array( 'page_namespace' => $this->title->getNamespace(),
'page_title' => $this->title->getDBkey()
),
__METHOD__,
- $options
+ array( 'FOR UPDATE' ) // lock page
);
if( $page ) {
$makepage = false;
Property changes on: branches/REL1_19/phase3/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,112066,112079,112128,113039,113046,113099
+ /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,112066,112079,112128,112918,113039,113046,113099,113214,113268,113277,113312,113415,113454,113737,113758
Modified: branches/REL1_19/phase3/languages/messages/MessagesEn.php
===================================================================
--- branches/REL1_19/phase3/languages/messages/MessagesEn.php 2012-03-16
14:48:02 UTC (rev 114014)
+++ branches/REL1_19/phase3/languages/messages/MessagesEn.php 2012-03-16
15:18:19 UTC (rev 114015)
@@ -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/REL1_19/phase3/languages/messages/MessagesQqq.php
===================================================================
--- branches/REL1_19/phase3/languages/messages/MessagesQqq.php 2012-03-16
14:48:02 UTC (rev 114014)
+++ branches/REL1_19/phase3/languages/messages/MessagesQqq.php 2012-03-16
15:18:19 UTC (rev 114015)
@@ -1790,6 +1790,7 @@
Does not work under $wgMiserMode ([[mwr:48986|r48986]]).',
'rc-change-size-new' => 'Tooltip when hovering a change list diff
size. The tooltip shows 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/REL1_19/phase3/resources/jquery/jquery.textSelection.js
===================================================================
--- branches/REL1_19/phase3/resources/jquery/jquery.textSelection.js
2012-03-16 14:48:02 UTC (rev 114014)
+++ branches/REL1_19/phase3/resources/jquery/jquery.textSelection.js
2012-03-16 15:18:19 UTC (rev 114015)
@@ -131,8 +131,58 @@
var isSample = false;
if ( this.style.display == 'none' ) {
// Do nothing
+ } else if ( document.selection &&
document.selection.createRange ) {
+ // IE
+
+ // Note that IE9 will trigger the next section unless
we check this first.
+ // See bug 35201.
+
+ activateElementOnIE( this );
+ if ( context ) {
+ context.fn.restoreCursorAndScrollTop();
+ }
+ if ( options.selectionStart !== undefined ) {
+ $(this).textSelection( 'setSelection', {
'start': options.selectionStart, 'end': options.selectionEnd } );
+ }
+
+ var selText = $(this).textSelection( 'getSelection' );
+ var scrollTop = this.scrollTop;
+ var range = document.selection.createRange();
+
+ checkSelectedText();
+ var insertText = pre + selText + post;
+ if ( options.splitlines ) {
+ insertText = doSplitLines( selText, pre, post );
+ }
+ if ( options.ownline && range.moveStart ) {
+ var range2 = document.selection.createRange();
+ range2.collapse();
+ range2.moveStart( 'character', -1 );
+ // FIXME: Which check is correct?
+ if ( range2.text != "\r" && range2.text != "\n"
&& range2.text != "" ) {
+ insertText = "\n" + insertText;
+ pre += "\n";
+ }
+ var range3 = document.selection.createRange();
+ range3.collapse( false );
+ range3.moveEnd( 'character', 1 );
+ if ( range3.text != "\r" && range3.text != "\n"
&& range3.text != "" ) {
+ insertText += "\n";
+ post += "\n";
+ }
+ }
+
+ range.text = insertText;
+ if ( isSample && options.selectPeri && range.moveStart
) {
+ range.moveStart( 'character', - post.length -
selText.length );
+ range.moveEnd( 'character', - post.length );
+ }
+ range.select();
+ // Restore the scroll position
+ this.scrollTop = scrollTop;
} else if ( this.selectionStart || this.selectionStart == '0' )
{
// Mozilla/Opera
+
$(this).focus();
if ( options.selectionStart !== undefined ) {
$(this).textSelection( 'setSelection', {
'start': options.selectionStart, 'end': options.selectionEnd } );
@@ -182,51 +232,6 @@
this.selectionStart = startPos +
insertText.length;
this.selectionEnd = this.selectionStart;
}
- } else if ( document.selection &&
document.selection.createRange ) {
- // IE
- activateElementOnIE( this );
- if ( context ) {
- context.fn.restoreCursorAndScrollTop();
- }
- if ( options.selectionStart !== undefined ) {
- $(this).textSelection( 'setSelection', {
'start': options.selectionStart, 'end': options.selectionEnd } );
- }
-
- var selText = $(this).textSelection( 'getSelection' );
- var scrollTop = this.scrollTop;
- var range = document.selection.createRange();
-
- checkSelectedText();
- var insertText = pre + selText + post;
- if ( options.splitlines ) {
- insertText = doSplitLines( selText, pre, post );
- }
- if ( options.ownline && range.moveStart ) {
- var range2 = document.selection.createRange();
- range2.collapse();
- range2.moveStart( 'character', -1 );
- // FIXME: Which check is correct?
- if ( range2.text != "\r" && range2.text != "\n"
&& range2.text != "" ) {
- insertText = "\n" + insertText;
- pre += "\n";
- }
- var range3 = document.selection.createRange();
- range3.collapse( false );
- range3.moveEnd( 'character', 1 );
- if ( range3.text != "\r" && range3.text != "\n"
&& range3.text != "" ) {
- insertText += "\n";
- post += "\n";
- }
- }
-
- range.text = insertText;
- if ( isSample && options.selectPeri && range.moveStart
) {
- range.moveStart( 'character', - post.length -
selText.length );
- range.moveEnd( 'character', - post.length );
- }
- range.select();
- // Restore the scroll position
- this.scrollTop = scrollTop;
}
$(this).trigger( 'encapsulateSelection', [ options.pre,
options.peri, options.post, options.ownline,
options.replace, options.spitlines ] );
Modified: branches/REL1_19/phase3/resources/mediawiki/mediawiki.util.js
===================================================================
--- branches/REL1_19/phase3/resources/mediawiki/mediawiki.util.js
2012-03-16 14:48:02 UTC (rev 114014)
+++ branches/REL1_19/phase3/resources/mediawiki/mediawiki.util.js
2012-03-16 15:18:19 UTC (rev 114015)
@@ -29,10 +29,20 @@
// 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 = (
+ profile.platform === 'mac'
+ // Chrome on Mac
+ ? 'ctrl-option-'
+ : profile.platform === 'win'
+ // Chrome on Windows
+ // (both alt- and
alt-shift work, but alt-f triggers Chrome wrench menu
+ // which alt-shift-f
does not)
+ ? 'alt-shift-'
+ // Chrome on other
(Ubuntu?)
+ : 'alt-'
+ );
+
// Non-Windows Safari with webkit_version > 526
} else if ( profile.platform !== 'win'
&& profile.name === 'safari'
Modified:
branches/REL1_19/phase3/resources/mediawiki.action/mediawiki.action.watch.ajax.js
===================================================================
---
branches/REL1_19/phase3/resources/mediawiki.action/mediawiki.action.watch.ajax.js
2012-03-16 14:48:02 UTC (rev 114014)
+++
branches/REL1_19/phase3/resources/mediawiki.action/mediawiki.action.watch.ajax.js
2012-03-16 15:18:19 UTC (rev 114015)
@@ -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
