diff options
Diffstat (limited to 'modules/organize')
| -rw-r--r-- | modules/organize/controllers/organize.php | 10 | ||||
| -rw-r--r-- | modules/organize/views/organize.html.php | 2 | ||||
| -rw-r--r-- | modules/organize/views/organize_album.html.php | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php index 898be509..d60aa838 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::purify($item->title), - "description" => empty($item->description) ? "" : p::purify($item->description))); + array("title" => SafeString::purify($item->title), + "description" => empty($item->description) ? "" : SafeString::purify($item->description))); } function tree($item, $parent) { @@ -281,10 +281,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::purify($item->title))); + $message = t("Saved album %album_title", array("album_title" => SafeString::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::purify($item->title))); + $message = t("Saved photo %photo_title", array("photo_title" => SafeString::purify($item->title))); } print json_encode(array("form" => $form->__toString(), "message" => $message)); } else { @@ -321,7 +321,7 @@ class Organize_Controller extends Controller { $item->save(); log::success("content", "Updated album", "<a href=\"albums/$item->id\">view</a>"); - $message = t("Saved album %album_title", array("album_title" => p::purify($item->title))); + $message = t("Saved album %album_title", array("album_title" => SafeString::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 1686d255..1182a887 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::purify($item->title))) ?></legend> + <legend><?= t("Organize %name", array("name" => SafeString::purify($item->title))) ?></legend> </fieldset> <div id="doc3" class="yui-t7"> <div id="bd"> diff --git a/modules/organize/views/organize_album.html.php b/modules/organize/views/organize_album.html.php index ae2d5d51..4933ed32 100644 --- a/modules/organize/views/organize_album.html.php +++ b/modules/organize/views/organize_album.html.php @@ -7,7 +7,7 @@ <div id="gOrganizeBranch-<?= $album->id ?>" ref="<?= $album->id ?>" class="<?= $selected ? "gBranchSelected" : "" ?> gBranchText"> - <?= p::clean($album->title) ?> + <?= SafeString::of($album->title) ?> </div> <div id="gOrganizeChildren-<?= $album->id ?>" class="<?= $album_icon == "ui-icon-plus" ? "gBranchCollapsed" : "" ?>"> |