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/exif | |
| parent | 93b542ccd8a64bdd037d0e4824be06cb9fe6ad49 (diff) | |
| parent | 7015948357f91e79bb10595cd7c6bc2513d0863e (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/exif')
| -rw-r--r-- | modules/exif/helpers/exif.php | 2 | ||||
| -rw-r--r-- | modules/exif/views/exif_dialog.html.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php index 20ecd0cb..9a4dbeec 100644 --- a/modules/exif/helpers/exif.php +++ b/modules/exif/helpers/exif.php @@ -164,7 +164,7 @@ class exif_Core { if ($remaining) { site_status::warning( t('Your Exif index needs to be updated. <a href="%url" class="gDialogLink">Fix this now</a>', - array("url" => url::site("admin/maintenance/start/exif_task::update_index?csrf=__CSRF__"))), + array("url" => html::mark_safe(url::site("admin/maintenance/start/exif_task::update_index?csrf=__CSRF__")))), "exif_index_out_of_date"); } } diff --git a/modules/exif/views/exif_dialog.html.php b/modules/exif/views/exif_dialog.html.php index 6494b2b0..11d1e212 100644 --- a/modules/exif/views/exif_dialog.html.php +++ b/modules/exif/views/exif_dialog.html.php @@ -14,14 +14,14 @@ <?= $details[$i]["caption"] ?> </td> <td class="gOdd"> - <?= p::clean($details[$i]["value"]) ?> + <?= html::clean($details[$i]["value"]) ?> </td> <? if (!empty($details[++$i])): ?> <td class="gEven"> <?= $details[$i]["caption"] ?> </td> <td class="gOdd"> - <?= p::clean($details[$i]["value"]) ?> + <?= html::clean($details[$i]["value"]) ?> </td> <? else: ?> <td class="gEven"></td><td class="gOdd"></td> |