https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113936
Revision: 113936
Author: reedy
Date: 2012-03-15 17:35:08 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
MFT r113268, r113892
Modified Paths:
--------------
branches/wmf/1.19wmf1/includes/specials/SpecialUndelete.php
branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.util.js
Property Changed:
----------------
branches/wmf/1.19wmf1/
branches/wmf/1.19wmf1/includes/
branches/wmf/1.19wmf1/includes/specials/
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,112918,112951,112995,113039,113085,113099,113169,113195,113214,113312,113394,113412,113415,113617,113710,113727,113737,113775,113816
+ /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,113268,113312,113394,113412,113415,113617,113710,113727,113737,113775,113816,113892
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,112918,112951,112995,113099,113169,113195,113214,113312,113394,113412,113415,113441,113617,113710,113727,113737,113816
+ /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,113892
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,112918,112995,113099,113169,113214,113394,113415,113617,113710,113727,113737,113816
+ /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,113892
Modified: branches/wmf/1.19wmf1/includes/specials/SpecialUndelete.php
===================================================================
--- branches/wmf/1.19wmf1/includes/specials/SpecialUndelete.php 2012-03-15
17:27:04 UTC (rev 113935)
+++ branches/wmf/1.19wmf1/includes/specials/SpecialUndelete.php 2012-03-15
17:35:08 UTC (rev 113936)
@@ -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;
Modified: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.util.js
===================================================================
--- branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.util.js 2012-03-15
17:27:04 UTC (rev 113935)
+++ branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.util.js 2012-03-15
17:35:08 UTC (rev 113936)
@@ -29,16 +29,18 @@
// Chrome on any platform
} else if ( profile.name === 'chrome' ) {
-
+
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-'
+ 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
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
