* (bug 9403) Sanitize newlines from search term input

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ce88512..40047f2 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -104,6 +104,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 11563) Deprecated SearchMySQL4 class; merged code to SearchMySQL
 * (bug 12801) Fix link in subtitle message in AJAX search
 * (bug 13428) Fix regression in protection form layout HTML validity
+* (bug 9403) Sanitize newlines from search term input
 
 
 === API changes in 1.13 ===

diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php
index b531caa..1d6e2a6 100644 (file)
--- a/includes/SpecialSearch.php
+++ b/includes/SpecialSearch.php
@@ -30,7 +30,7 @@
 function wfSpecialSearch( $par = '' ) {
        global $wgRequest, $wgUser;
 
-       $search = $wgRequest->getText( 'search', $par );
+       $search = str_replace( "\n", " ", $wgRequest->getText( 'search', $par ) );
        $searchPage = new SpecialSearch( $wgRequest, $wgUser );
        if( $wgRequest->getVal( 'fulltext' ) ||
                !is_null( $wgRequest->getVal( 'offset' ) ) ||