diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-07-03 04:48:54 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-07-03 04:48:54 -0700 |
| commit | bd1b2f414741bb9bb68c8f94a291bedd5c9925c0 (patch) | |
| tree | 97d5641a11b9551db3a1ff0f0f39277ac4efeb89 /modules/organize | |
| parent | eb5538d1357dade9e6e08d1b603033928944011c (diff) | |
| parent | 54ffea24196e8f5d88cf9d8607455f0f6aab305c (diff) | |
Merge branch 'master' of git@github.com:/gallery/gallery3
Diffstat (limited to 'modules/organize')
| -rw-r--r-- | modules/organize/controllers/organize.php | 10 | ||||
| -rw-r--r-- | modules/organize/views/organize.html.php | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php index 5f80805c..6792573d 100644 --- a/modules/organize/controllers/organize.php +++ b/modules/organize/controllers/organize.php @@ -62,8 +62,8 @@ class Organize_Controller extends Controller { access::required("edit", $item); print json_encode( - array("title" => p::clean($item->title), - "description" => empty($item->description) ? "" : p::clean($item->description))); + array("title" => p::purify($item->title), + "description" => empty($item->description) ? "" : p::purify($item->description))); } function tree($item, $parent) { @@ -283,10 +283,10 @@ class Organize_Controller extends Controller { if ($item->is_album()) { log::success("content", "Updated album", "<a href=\"albums/$item->id\">view</a>"); - $message = t("Saved album %album_title", array("album_title" => p::clean($item->title))); + $message = t("Saved album %album_title", array("album_title" => p::purify($item->title))); } else { log::success("content", "Updated photo", "<a href=\"photos/$item->id\">view</a>"); - $message = t("Saved photo %photo_title", array("photo_title" => p::clean($item->title))); + $message = t("Saved photo %photo_title", array("photo_title" => p::purify($item->title))); } print json_encode(array("form" => $form->__toString(), "message" => $message)); } else { @@ -325,7 +325,7 @@ class Organize_Controller extends Controller { module::event("item_updated", $orig, $item); log::success("content", "Updated album", "<a href=\"albums/$item->id\">view</a>"); - $message = t("Saved album %album_title", array("album_title" => p::clean($item->title))); + $message = t("Saved album %album_title", array("album_title" => p::purify($item->title))); print json_encode(array("form" => $form->__toString(), "message" => $message)); } else { print json_encode(array("form" => $form->__toString())); diff --git a/modules/organize/views/organize.html.php b/modules/organize/views/organize.html.php index 6e5bfcea..65d67d04 100644 --- a/modules/organize/views/organize.html.php +++ b/modules/organize/views/organize.html.php @@ -16,7 +16,7 @@ var CONFIRM_DELETE = "<?= t("Do you really want to delete the selected albums an }); </script> <fieldset style="display: none"> - <legend><?= t("Organize %name", array("name" => p::clean($item->title))) ?></legend> + <legend><?= t("Organize %name", array("name" => p::purify($item->title))) ?></legend> </fieldset> <div id="doc3" class="yui-t7"> <div id="bd"> |