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/organize/views | |
| parent | 93b542ccd8a64bdd037d0e4824be06cb9fe6ad49 (diff) | |
| parent | 7015948357f91e79bb10595cd7c6bc2513d0863e (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/organize/views')
| -rw-r--r-- | modules/organize/views/organize_dialog.html.php | 2 | ||||
| -rw-r--r-- | modules/organize/views/organize_tree.html.php | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php index 54f21178..cbc2e4f9 100644 --- a/modules/organize/views/organize_dialog.html.php +++ b/modules/organize/views/organize_dialog.html.php @@ -6,7 +6,7 @@ var tree_url = "<?= url::site("organize/tree/__ALBUM_ID__") ?>"; </script> <div id="gOrganize" class="gDialogPanel"> - <h1 style="display:none"><?= t("Organize %name", array("name" => p::purify($album->title))) ?></h1> + <h1 style="display:none"><?= t("Organize %name", array("name" => html::purify($album->title))) ?></h1> <div id="bd"> <div class="yui-gf"> <div class="yui-u first"> diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php index 58621c3c..c0c23f94 100644 --- a/modules/organize/views/organize_tree.html.php +++ b/modules/organize/views/organize_tree.html.php @@ -3,11 +3,9 @@ ref="<?= $album->id ?>"> <span class="ui-icon ui-icon-minus"> </span> - <span class="gOrganizeAlbumText - <?= $selected && $album->id == $selected->id ? "selected" : "" ?> - " + <span class="gOrganizeAlbumText <?= $selected && $album->id == $selected->id ? "selected" : "" ?>" ref="<?= $album->id ?>"> - <?= p::clean($album->title) ?> + <?= html::clean($album->title) ?> </span> <ul> <? foreach ($album->children(null, 0, array("type" => "album")) as $child): ?> @@ -19,7 +17,7 @@ <span class="ui-icon ui-icon-plus"> </span> <span class="gOrganizeAlbumText" ref="<?= $child->id ?>"> - <?= p::clean($child->title) ?> + <?= html::clean($child->title) ?> </span> </li> <? endif ?> |