diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2009-08-30 22:33:12 -0600 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2009-08-30 22:33:12 -0600 |
| commit | ce733e0f481e34f213d159cbb05dd6377cec4f54 (patch) | |
| tree | 046818b9a56014849ee5a8054f739862cb115f68 /modules/search | |
| parent | 93b542ccd8a64bdd037d0e4824be06cb9fe6ad49 (diff) | |
| parent | 7015948357f91e79bb10595cd7c6bc2513d0863e (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/search')
| -rw-r--r-- | modules/search/helpers/search.php | 2 | ||||
| -rw-r--r-- | modules/search/views/search.html.php | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php index 355c4493..5e23a04b 100644 --- a/modules/search/helpers/search.php +++ b/modules/search/helpers/search.php @@ -58,7 +58,7 @@ class search_Core { if ($remaining) { site_status::warning( t('Your search index needs to be updated. <a href="%url" class="gDialogLink">Fix this now</a>', - array("url" => url::site("admin/maintenance/start/search_task::update_index?csrf=__CSRF__"))), + array("url" => html::mark_safe(url::site("admin/maintenance/start/search_task::update_index?csrf=__CSRF__")))), "search_index_out_of_date"); } } diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php index 6a222ef1..7963948d 100644 --- a/modules/search/views/search.html.php +++ b/modules/search/views/search.html.php @@ -8,10 +8,10 @@ <ul> <li> <label for="q"><?= t("Search the gallery") ?></label> - <input name="q" id="q" type="text" value="<?= p::clean($q) ?>"/> + <input name="q" id="q" type="text" value="<?= html::clean_attribute($q) ?>"/> </li> <li> - <input type="submit" value="<?= t("Search") ?>" /> + <input type="submit" value="<?= t("Search")->for_html_attr() ?>" /> </li> </ul> </fieldset> @@ -31,10 +31,10 @@ <a href="<?= url::site("items/$item->id") ?>"> <?= $item->thumb_img() ?> <p> - <?= p::purify($item->title) ?> + <?= html::purify($item->title) ?> </p> <div> - <?= nl2br(p::purify($item->description)) ?> + <?= nl2br(html::purify($item->description)) ?> </div> </a> </li> @@ -44,7 +44,7 @@ <? else: ?> <p> - <?= t("No results found for <b>%term</b>", array("term" => p::clean($q))) ?> + <?= t("No results found for <b>%term</b>", array("term" => $q)) ?> </p> <? endif; ?> |