diff options
Diffstat (limited to 'includes/SpecialSearch.php')
| -rw-r--r-- | includes/SpecialSearch.php | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php index 057b487c..9ecd39ef 100644 --- a/includes/SpecialSearch.php +++ b/includes/SpecialSearch.php @@ -70,19 +70,17 @@ class SpecialSearch { } /** - * If an exact title match can be found, jump straight ahead to + * If an exact title match can be found, jump straight ahead to it. * @param string $term * @public */ function goResult( $term ) { global $wgOut; global $wgGoToEdit; - global $wgContLang; $this->setupPage( $term ); # Try to go to page as entered. - # $t = Title::newFromText( $term ); # If the string cannot be used to create a title @@ -99,17 +97,13 @@ class SpecialSearch { # No match, generate an edit URL $t = Title::newFromText( $term ); - if( is_null( $t ) ) { - $editurl = ''; # hrm... - } else { + if( ! is_null( $t ) ) { wfRunHooks( 'SpecialSearchNogomatch', array( &$t ) ); # If the feature is enabled, go straight to the edit page if ( $wgGoToEdit ) { $wgOut->redirect( $t->getFullURL( 'action=edit' ) ); return; - } else { - $editurl = $t->escapeLocalURL( 'action=edit' ); - } + } } $wgOut->addWikiText( wfMsg( 'noexactmatch', wfEscapeWikiText( $term ) ) ); @@ -126,8 +120,7 @@ class SpecialSearch { $this->setupPage( $term ); - global $wgUser, $wgOut; - $sk = $wgUser->getSkin(); + global $wgOut; $wgOut->addWikiText( wfMsg( 'searchresulttext' ) ); #if ( !$this->parseQuery() ) { @@ -177,7 +170,7 @@ class SpecialSearch { if( $num || $this->offset ) { $prevnext = wfViewPrevNext( $this->offset, $this->limit, - 'Special:Search', + SpecialPage::getTitleFor( 'Search' ), wfArrayToCGI( $this->powerSearchOptions(), array( 'search' => $term ) ) ); @@ -323,10 +316,8 @@ class SpecialSearch { } $sk =& $wgUser->getSkin(); - $contextlines = $wgUser->getOption( 'contextlines' ); - if ( '' == $contextlines ) { $contextlines = 5; } - $contextchars = $wgUser->getOption( 'contextchars' ); - if ( '' == $contextchars ) { $contextchars = 50; } + $contextlines = $wgUser->getOption( 'contextlines', 5 ); + $contextchars = $wgUser->getOption( 'contextchars', 50 ); $link = $sk->makeKnownLinkObj( $t ); $revision = Revision::newFromTitle( $t ); @@ -348,6 +339,7 @@ class SpecialSearch { break; } ++$lineno; + $m = array(); if ( ! preg_match( $pat1, $line, $m ) ) { continue; } @@ -404,7 +396,7 @@ class SpecialSearch { '', '', '', '', '', # Dummy placeholders $searchButton ); - $title = Title::makeTitle( NS_SPECIAL, 'Search' ); + $title = SpecialPage::getTitleFor( 'Search' ); $action = $title->escapeLocalURL(); return "<br /><br />\n<form id=\"powersearch\" method=\"get\" " . "action=\"$action\">\n{$ret}\n</form>\n"; |