aboutsummaryrefslogtreecommitdiff
path: root/mod/search/pages/search/index.php
diff options
context:
space:
mode:
authorPaweł Sroka <srokap@gmail.com>2014-01-01 13:12:10 +0100
committerPaweł Sroka <srokap@gmail.com>2014-01-01 13:12:10 +0100
commit7006294fcbfab450289403b6519edb9d5d30ff35 (patch)
tree5dd58bccbe443795fd41aaa4afeafba6ed2a96d5 /mod/search/pages/search/index.php
parent82b30f63043eba9c18999bd2a15301d62ead4a76 (diff)
parentc1ea910e3b3b0bcc27a214383c9f6355a05dd495 (diff)
downloadelgg-7006294fcbfab450289403b6519edb9d5d30ff35.tar.gz
elgg-7006294fcbfab450289403b6519edb9d5d30ff35.tar.bz2
Merged in csrf_fix (pull request #7)
Added function for escaping query strings and fixed several XSRF vulnerabilities.
Diffstat (limited to 'mod/search/pages/search/index.php')
-rw-r--r--mod/search/pages/search/index.php10
1 files changed, 1 insertions, 9 deletions
diff --git a/mod/search/pages/search/index.php b/mod/search/pages/search/index.php
index ede09329b..9542e0751 100644
--- a/mod/search/pages/search/index.php
+++ b/mod/search/pages/search/index.php
@@ -17,15 +17,7 @@ $search_type = get_input('search_type', 'all');
// XSS protection is more important that searching for HTML.
$query = stripslashes(get_input('q', get_input('tag', '')));
-// @todo - create function for sanitization of strings for display in 1.8
-// encode <,>,&, quotes and characters above 127
-if (function_exists('mb_convert_encoding')) {
- $display_query = mb_convert_encoding($query, 'HTML-ENTITIES', 'UTF-8');
-} else {
- // if no mbstring extension, we just strip characters
- $display_query = preg_replace("/[^\x01-\x7F]/", "", $query);
-}
-$display_query = htmlspecialchars($display_query, ENT_QUOTES, 'UTF-8', false);
+$display_query = _elgg_get_display_query($query);
// check that we have an actual query
if (!$query) {