Merge "Add help link to Special:Search"

diff --combined includes/specials/SpecialSearch.php
index d6ce6a4,5254be9..596732d
--- 1/includes/specials/SpecialSearch.php
--- 2/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@@ -73,12 -73,6 +73,12 @@@ class SpecialSearch extends SpecialPag
         */
        protected $runSuggestion = true;
  
 +      /**
 +       * Names of the wikis, in format: Interwiki prefix -> caption
 +       * @var array
 +       */
 +      protected $customCaptions;
 +
        const NAMESPACES_CURRENT = 'sense';
  
        public function __construct() {
@@@ -99,6 -93,7 +99,7 @@@
                        'mediawiki.special', 'mediawiki.special.search', 'mediawiki.ui', 'mediawiki.ui.button',
                        'mediawiki.ui.input',
                ) );
+               $this->addHelpLink( 'Help:Searching' );
  
                // Strip underscores from title parameter; most of the time we'll want
                // text form here. But don't strip underscores from actual text params!
@@@ -377,45 -372,25 +378,45 @@@
                        if ( $numTextMatches > 0 ) {
                                $out->addHTML( $this->showMatches( $textMatches ) );
                        }
 -                      // show interwiki results if any
 -                      if ( $textMatches->hasInterwikiResults() ) {
 -                              $out->addHTML( $this->showInterwiki( $textMatches->getInterwikiResults(), $term ) );
 +
 +                      // show secondary interwiki results if any
 +                      if ( $textMatches->hasInterwikiResults( SearchResultSet::SECONDARY_RESULTS ) ) {
 +                              $out->addHTML( $this->showInterwiki( $textMatches->getInterwikiResults(
 +                                              SearchResultSet::SECONDARY_RESULTS ), $term ) );
                        }
  
                        $textMatches->free();
                }
 +
 +              $hasOtherResults = $textMatches->hasInterwikiResults( SearchResultSet::INLINE_RESULTS );
 +
                if ( $num === 0 ) {
                        if ( $textStatus ) {
                                $out->addHTML( '<div class="error">' .
                                        $textStatus->getMessage( 'search-error' ) . '</div>' );
                        } else {
 -                              $out->wrapWikiMsg( "<p class=\"mw-search-nonefound\">\n$1</p>",
 -                                      array( 'search-nonefound', wfEscapeWikiText( $term ) ) );
                                $this->showCreateLink( $title, $num, $titleMatches, $textMatches );
 +                              $out->wrapWikiMsg( "<p class=\"mw-search-nonefound\">\n$1</p>",
 +                                      array( $hasOtherResults ? 'search-nonefound-thiswiki' : 'search-nonefound',
 +                                                      wfEscapeWikiText( $term )
 +                                      ) );
 +                      }
 +              }
 +
 +              if ( $hasOtherResults ) {
 +                      foreach ( $textMatches->getInterwikiResults( SearchResultSet::INLINE_RESULTS )
 +                                              as $interwiki => $interwikiResult ) {
 +                              if ( $interwikiResult instanceof Status || $interwikiResult->numRows() == 0 ) {
 +                                      // ignore bad interwikis for now
 +                                      continue;
 +                              }
 +                              // TODO: wiki header
 +                              $out->addHTML( $this->showMatches( $interwikiResult, $interwiki ) );
                        }
                }
  
                $out->addHTML( '<div class="visualClear"></div>' );
 +
                if ( $prevnext ) {
                        $out->addHTML( "<p class='mw-search-pager-bottom'>{$prevnext}</p>\n" );
                }
@@@ -426,17 -401,6 +427,17 @@@
  
        }
  
 +      /**
 +       * Produce wiki header for interwiki results
 +       * @param string $interwiki Interwiki name
 +       * @param SearchResultSet $interwikiResult The result set
 +       */
 +      protected function interwikiHeader( $interwiki, $interwikiResult ) {
 +              // TODO: we need to figure out how to name wikis correctly
 +              $wikiMsg = $this->msg( 'search-interwiki-results-' . $interwiki )->parse();
 +              return "<p class=\"mw-search-interwiki-header\">\n$wikiMsg</p>";
 +      }
 +
        /**
         * Decide if the suggested query should be run, and it's results returned
         * instead of the provided $textMatches
@@@ -673,23 -637,17 +674,23 @@@
         * Show whole set of results
         *
         * @param SearchResultSet $matches
 +       * @param string $interwiki Interwiki name
         *
         * @return string
         */
 -      protected function showMatches( &$matches ) {
 +      protected function showMatches( &$matches, $interwiki = null ) {
                global $wgContLang;
  
                $terms = $wgContLang->convertForSearchResult( $matches->termMatches() );
 -
 -              $out = "<ul class='mw-search-results'>\n";
 +              $out = '';
                $result = $matches->next();
                $pos = $this->offset;
 +
 +              if ( $result && $interwiki ) {
 +                      $out .= $this->interwikiHeader( $interwiki, $result );
 +              }
 +
 +              $out .= "<ul class='mw-search-results'>\n";
                while ( $result ) {
                        $out .= $this->showHit( $result, $terms, ++$pos );
                        $result = $matches->next();
@@@ -726,16 -684,14 +727,16 @@@
                }
  
                $link_t = clone $title;
 +              $query = array();
  
                Hooks::run( 'ShowSearchHitTitle',
 -                      array( &$link_t, &$titleSnippet, $result, $terms, $this ) );
 +                      array( &$link_t, &$titleSnippet, $result, $terms, $this, &$query ) );
  
                $link = Linker::linkKnown(
                        $link_t,
                        $titleSnippet,
 -                      array( 'data-serp-pos' => $position ) // HTML attributes
 +                      array( 'data-serp-pos' => $position ), // HTML attributes
 +                      $query
                );
  
                // If page content is not readable, just return the title.
@@@ -863,23 -819,6 +864,23 @@@
                return $html;
        }
  
 +      /**
 +       * Extract custom captions from search-interwiki-custom message
 +       */
 +      protected function getCustomCaptions() {
 +              if ( is_null( $this->customCaptions ) ) {
 +                      $this->customCaptions = array();
 +                      // format per line <iwprefix>:<caption>
 +                      $customLines = explode( "\n", $this->msg( 'search-interwiki-custom' )->text() );
 +                      foreach ( $customLines as $line ) {
 +                              $parts = explode( ":", $line, 2 );
 +                              if ( count( $parts ) == 2 ) { // validate line
 +                                      $this->customCaptions[$parts[0]] = $parts[1];
 +                              }
 +                      }
 +              }
 +      }
 +
        /**
         * Show results from other wikis
         *
@@@ -896,7 -835,15 +897,7 @@@
                $out .= "<ul class='mw-search-iwresults'>\n";
  
                // work out custom project captions
 -              $customCaptions = array();
 -              // format per line <iwprefix>:<caption>
 -              $customLines = explode( "\n", $this->msg( 'search-interwiki-custom' )->text() );
 -              foreach ( $customLines as $line ) {
 -                      $parts = explode( ":", $line, 2 );
 -                      if ( count( $parts ) == 2 ) { // validate line
 -                              $customCaptions[$parts[0]] = $parts[1];
 -                      }
 -              }
 +              $this->getCustomCaptions();
  
                if ( !is_array( $matches ) ) {
                        $matches = array( $matches );
@@@ -906,7 -853,7 +907,7 @@@
                        $prev = null;
                        $result = $set->next();
                        while ( $result ) {
 -                              $out .= $this->showInterwikiHit( $result, $prev, $query, $customCaptions );
 +                              $out .= $this->showInterwikiHit( $result, $prev, $query );
                                $prev = $result->getInterwikiPrefix();
                                $result = $set->next();
                        }
@@@ -927,10 -874,11 +928,10 @@@
         * @param SearchResult $result
         * @param string $lastInterwiki
         * @param string $query
 -       * @param array $customCaptions Interwiki prefix -> caption
         *
         * @return string
         */
 -      protected function showInterwikiHit( $result, $lastInterwiki, $query, $customCaptions ) {
 +      protected function showInterwikiHit( $result, $lastInterwiki, $query ) {
  
                if ( $result->isBrokenTitle() ) {
                        return '';
@@@ -967,9 -915,9 +968,9 @@@
                $out = "";
                // display project name
                if ( is_null( $lastInterwiki ) || $lastInterwiki != $title->getInterwiki() ) {
 -                      if ( array_key_exists( $title->getInterwiki(), $customCaptions ) ) {
 +                      if ( array_key_exists( $title->getInterwiki(), $this->customCaptions ) ) {
                                // captions from 'search-interwiki-custom'
 -                              $caption = $customCaptions[$title->getInterwiki()];
 +                              $caption = $this->customCaptions[$title->getInterwiki()];
                        } else {
                                // default is to show the hostname of the other wiki which might suck
                                // if there are many wikis on one hostname