From bf786b038ec6f56f12f6ed09899147705b0d8b50 Mon Sep 17 00:00:00 2001 From: rvelices Date: Tue, 30 Sep 2014 21:09:00 +0000 Subject: bug 3148: merger -r29852 from trunk quick search fix html special chars git-svn-id: http://piwigo.org/svn/branches/2.7@29853 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/batch_manager.php | 2 +- index.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/batch_manager.php b/admin/batch_manager.php index a93fffda2..bd64437c8 100644 --- a/admin/batch_manager.php +++ b/admin/batch_manager.php @@ -514,7 +514,7 @@ if (isset($_SESSION['bulk_manager_filter']['search']) && $res = get_quick_search_results_no_cache($_SESSION['bulk_manager_filter']['search']['q'], array('permissions'=>false)); if (!empty($res['items']) && !empty($res['qs']['unmatched_terms'])) { - $template->assign('no_search_results', $res['qs']['unmatched_terms']); + $template->assign('no_search_results', array_map('htmlspecialchars', $res['qs']['unmatched_terms']) ); } $filter_sets[] = $res['items']; } diff --git a/index.php b/index.php index 1f524ed17..0e4f34ea4 100644 --- a/index.php +++ b/index.php @@ -245,7 +245,7 @@ if ( empty($page['is_external']) or !$page['is_external'] ) } elseif (!empty($page['qsearch_details']['unmatched_terms'])) { - $template->assign( 'no_search_results', array_map($page['qsearch_details']['unmatched_terms'], 'htmlspecialchars')); + $template->assign( 'no_search_results', array_map('htmlspecialchars', $page['qsearch_details']['unmatched_terms'])); } } -- cgit v1.2.3