Merge "Update usage of getTitleSnippet(), getRedirectSnippet() and getSectionSnippet()"

diff --combined includes/specials/SpecialSearch.php
index daa5e82,e3e2f4e..8ff4097
--- 1/includes/specials/SpecialSearch.php
--- 2/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@@ -197,6 -197,14 +197,6 @@@ class SpecialSearch extends SpecialPag
                $title = Title::newFromText( $term );
                if ( !is_null( $title ) ) {
                        wfRunHooks( 'SpecialSearchNogomatch', array( &$title ) );
 -                      wfDebugLog( 'nogomatch', $title->getFullText(), 'private' );
 -
 -                      # If the feature is enabled, go straight to the edit page
 -                      if ( $this->getConfig()->get( 'GoToEdit' ) ) {
 -                              $this->getOutput()->redirect( $title->getFullURL( array( 'action' => 'edit' ) ) );
 -
 -                              return;
 -                      }
                }
                $this->showResults( $term );
        }
@@@ -583,7 -591,7 +583,7 @@@
  
                $title = $result->getTitle();
  
-               $titleSnippet = $result->getTitleSnippet( $terms );
+               $titleSnippet = $result->getTitleSnippet();
  
                if ( $titleSnippet == '' ) {
                        $titleSnippet = null;
@@@ -1060,9 -1068,9 +1060,9 @@@
                        'class' => 'mw-ui-input mw-ui-input-inline',
                ) ) . "\n";
                $out .= Html::hidden( 'fulltext', 'Search' ) . "\n";
 -              $out .= Xml::submitButton(
 +              $out .= Html::submitButton(
                        $this->msg( 'searchbutton' )->text(),
 -                      array( 'class' => array( 'mw-ui-button', 'mw-ui-progressive' ) )
 +                      array(), array( 'mw-ui-progressive' )
                ) . "\n";
  
                // Results-info