From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Thu, 17 Jun 2010 19:01:50 +0000 (+0000)
Subject: (bug 23520) Add preference for SimpleSearch so users can disable it, and make it... 
X-Git-Tag: 1.31.0-rc.0~36481
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/categories/modifier.php?a=commitdiff_plain;h=7f1c8a65750656fec0abff6dea0872da20d50400;p=lhc%2Fweb%2Fwiklou.git

(bug 23520) Add preference for SimpleSearch so users can disable it, and make it obey the "Disable AJAX suggestions" preference
---

diff --git a/skins/Vector.php b/skins/Vector.php
index 279c795dab..96db057d34 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -675,7 +675,7 @@ class VectorTemplate extends QuickTemplate {
 	 * when UI is in RTL mode
 	 */
 	private function renderNavigation( $elements ) {
-		global $wgContLang, $wgVectorUseSimpleSearch, $wgVectorShowVariantName;
+		global $wgContLang, $wgVectorUseSimpleSearch, $wgVectorShowVariantName, $wgUser;
 
 		// If only one element was given, wrap it in an array, allowing more
 		// flexible arguments
@@ -768,7 +768,7 @@ class VectorTemplate extends QuickTemplate {
 	<h5<?php $this->html('userlangattributes') ?>><label for="searchInput"><?php $this->msg( 'search' ) ?></label></h5>
 	<form action="<?php $this->text( 'wgScript' ) ?>" id="searchform">
 		<input type='hidden' name="title" value="<?php $this->text( 'searchtitle' ) ?>"/>
-		<?php if ( $wgVectorUseSimpleSearch ): ?>
+		<?php if ( $wgVectorUseSimpleSearch && $wgUser->getOption( 'vector-simplesearch' ) ): ?>
 		<div id="simpleSearch">
 			<input id="searchInput" name="search" type="text" <?php echo $this->skin->tooltipAndAccesskey( 'search' ); ?> <?php if( isset( $this->data['search'] ) ): ?> value="<?php $this->text( 'search' ) ?>"<?php endif; ?> />
 			<button id="searchButton" type='submit' name='button' <?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?>>&#160;</button>