r81939 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r81938‎ | r81939 | r81940 >
Date:09:00, 11 February 2011
Author:catrope
Status:ok
Tags:
Comment:
1.17wmf1: Merge r76412 from 1.16wmf4
Modified paths:
  • /branches/wmf/1.17wmf1/extensions/PrefSwitch/PrefSwitch.hooks.php (modified) (history)
  • /branches/wmf/1.17wmf1/extensions/PrefSwitch/PrefSwitch.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.17wmf1/extensions/PrefSwitch/PrefSwitch.php
@@ -14,6 +14,7 @@
1515 /* Configuration */
1616
1717 $wgPrefSwitchStyleVersion = 1;
 18+$wgPrefSwitchShowLinks = true;
1819
1920 // Preferences to set when users switch prefs
2021 $wgPrefSwitchPrefs = array(
Index: branches/wmf/1.17wmf1/extensions/PrefSwitch/PrefSwitch.hooks.php
@@ -36,8 +36,11 @@
3737 * PersonalUrls hook
3838 */
3939 public static function personalUrls( &$personal_urls, &$title ) {
40 - global $wgUser, $wgRequest;
 40+ global $wgUser, $wgRequest, $wgPrefSwitchShowLinks;
4141
 42+ if ( !$wgPrefSwitchShowLinks ) {
 43+ return true;
 44+ }
4245 // Figure out the orgin to include in the link
4346 $fromquery = array();
4447 if ( !( $wgRequest->wasPosted() ) ) {

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r764121.16wmf4: Merge r76411catrope21:06, 9 November 2010

Status & tagging log