r68224 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r68223‎ | r68224 | r68225 >
Date:17:36, 18 June 2010
Author:catrope
Status:ok
Tags:
Comment:
Followup to r68177: per CR, move SimpleSearch preference to core.
Modified paths:
  • /trunk/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.i18n.php (modified) (history)
  • /trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php (modified) (history)
  • /trunk/phase3/includes/Preferences.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/Preferences.php
@@ -923,6 +923,15 @@
924924 'section' => 'searchoptions/display',
925925 );
926926 }
 927+
 928+ global $wgVectorUseSimpleSearch;
 929+ if ( $wgVectorUseSimpleSearch ) {
 930+ $defaultPreferences['vector-simplesearch'] = array(
 931+ 'type' => 'toggle',
 932+ 'label-message' => 'vector-simplesearch-preference',
 933+ 'section' => 'searchoptions/display'
 934+ );
 935+ }
927936
928937 $defaultPreferences['searcheverything'] = array(
929938 'type' => 'toggle',
Index: trunk/phase3/languages/messages/MessagesEn.php
@@ -796,6 +796,7 @@
797797 'vector-namespace-talk' => 'Discussion',
798798 'vector-namespace-template' => 'Template',
799799 'vector-namespace-user' => 'User page',
 800+'vector-simplesearch-preference' => 'Enable enhanced search suggestions (Vector skin only)',
800801 'vector-view-create' => 'Create',
801802 'vector-view-edit' => 'Edit',
802803 'vector-view-history' => 'View history',
Index: trunk/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.i18n.php
@@ -14,7 +14,6 @@
1515 $messages['en'] = array(
1616 'vector-simplesearch-search' => 'Search',
1717 'vector-simplesearch-containing' => 'containing...',
18 - 'vector-simplesearch-preference' => 'Enable enhanced search suggestions (Vector skin only)',
1918 );
2019
2120 /** Message documentation (Message documentation)
Index: trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php
@@ -74,11 +74,6 @@
7575 'preferences' => array(
7676 'enable' => array(
7777 'key' => 'vector-simplesearch',
78 - 'ui' => array(
79 - 'type' => 'toggle',
80 - 'label-message' => 'vector-simplesearch-preference',
81 - 'section' => 'searchoptions/display'
82 - ),
8378 ),
8479 'disablesuggest' => array(
8580 'key' => 'disablesuggest',

Follow-up revisions

RevisionCommit summaryAuthorDate
r68258Follow-up r68224: Update maintenance scriptraymond23:19, 18 June 2010
r687451.16wmf4: Merge Vector fixes from trunk: r68079, r68105, r68109, r68177, r682...catrope21:18, 29 June 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r68177(bug 23520) Add preference for SimpleSearch so users can disable it, and make...catrope19:01, 17 June 2010

Status & tagging log