| Index: branches/wmf/1.19wmf1/includes/specials/SpecialUndelete.php |
| — | — | @@ -405,13 +405,12 @@ |
| 406 | 406 | $article->loadPageData( 'fromdbmaster' ); |
| 407 | 407 | $oldcountable = $article->isCountable(); |
| 408 | 408 | |
| 409 | | - $options = 'FOR UPDATE'; // lock page |
| 410 | 409 | $page = $dbw->selectRow( 'page', |
| 411 | 410 | array( 'page_id', 'page_latest' ), |
| 412 | 411 | array( 'page_namespace' => $this->title->getNamespace(), |
| 413 | 412 | 'page_title' => $this->title->getDBkey() ), |
| 414 | 413 | __METHOD__, |
| 415 | | - $options |
| | 414 | + array( 'FOR UPDATE' ) // lock page |
| 416 | 415 | ); |
| 417 | 416 | if( $page ) { |
| 418 | 417 | $makepage = false; |
| Property changes on: branches/wmf/1.19wmf1/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 419 | 418 | Merged /trunk/phase3/includes/specials:r113892 |
| Property changes on: branches/wmf/1.19wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 420 | 419 | Merged /trunk/phase3/includes:r113892 |
| Index: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.util.js |
| — | — | @@ -29,16 +29,18 @@ |
| 30 | 30 | |
| 31 | 31 | // Chrome on any platform |
| 32 | 32 | } else if ( profile.name === 'chrome' ) { |
| 33 | | - |
| | 33 | + |
| 34 | 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-' |
| | 35 | + profile.platform === 'mac' |
| | 36 | + // Chrome on Mac |
| | 37 | + ? 'ctrl-option-' |
| | 38 | + : profile.platform === 'win' |
| | 39 | + // Chrome on Windows |
| | 40 | + // (both alt- and alt-shift work, but alt-f triggers Chrome wrench menu |
| | 41 | + // which alt-shift-f does not) |
| | 42 | + ? 'alt-shift-' |
| | 43 | + // Chrome on other (Ubuntu?) |
| | 44 | + : 'alt-' |
| 43 | 45 | ); |
| 44 | 46 | |
| 45 | 47 | // Non-Windows Safari with webkit_version > 526 |
| Property changes on: branches/wmf/1.19wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 46 | 48 | Merged /trunk/phase3:r113268,113892 |