From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 19 Mar 2008 00:34:49 +0000 (+0000)
Subject: * (bug 9403) Sanitize newlines from search term input
X-Git-Tag: 1.31.0-rc.0~48997
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=cc300d6a47ffc794ad4834f6661da2841e02191a;p=lhc%2Fweb%2Fwiklou.git

* (bug 9403) Sanitize newlines from search term input
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ce88512c1b..40047f2fff 100644
--- 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 b531caa73e..1d6e2a6a7a 100644
--- 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' ) ) ||