r43403 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r43402‎ | r43403 | r43404 >
Date:01:27, 12 November 2008
Author:aaron
Status:old (Comments)
Tags:
Comment:
Suppress index link if no term given
Modified paths:
  • /trunk/phase3/includes/specials/SpecialSearch.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/specials/SpecialSearch.php
——@@ -643,7 +643,8 @@
644644 $searchButton .
645645 ' (' . wfMsgExt('searchmenu-help',array('parseinline') ) . ')' .
646646 "</form>";
647 - $out .= wfMsgExt( 'searchmenu-prefix', array('parseinline'), $term );
 647+ if( $term )
 648+ $out .= wfMsgExt( 'searchmenu-prefix', array('parseinline'), $term );
648649
649650 return Xml::openElement( 'fieldset', array('id' => 'mw-searchoptions','style' => 'margin:0em;') ) .
650651 Xml::element( 'legend', null, wfMsg('searchmenu-legend') ) .
——@@ -790,7 +791,8 @@
791792 $out .= Xml::submitButton( wfMsg( 'searchbutton' ), array( 'name' => 'fulltext' ) );
792793 $out .= ' (' . wfMsgExt('searchmenu-help',array('parseinline') ) . ')';
793794 $out .= Xml::closeElement( 'form' );
794 - $out .= wfMsgExt( 'searchmenu-prefix', array('parseinline'), $term );
 795+ if( $term )
 796+ $out .= wfMsgExt( 'searchmenu-prefix', array('parseinline'), $term );
795797 return Xml::openElement( 'fieldset', array('id' => 'mw-searchoptions','style' => 'margin:0em;') ) .
796798 Xml::element( 'legend', null, wfMsg('searchmenu-legend') ) .
797799 $this->formHeader($term) . $out .

Follow-up revisions

RevisionCommit summaryAuthorDate
r43499Reverting in-development search changes pending fixing....brion19:11, 14 November 2008

Comments

#Comment by Brion VIBBER (talk | contribs)   19:25, 14 November 2008

Reverted in r43499 pending fixes. Can we do these experimental developments on a branch and avoid merging them to trunk until they're finalized? MediaWiki core trunk is supposed to be ready-to-deploy at all times; experiments should be done in branches, extensions, or disabled-by-default optional features to avoid delaying live code deployments.

Status & tagging log