mirror of
https://github.com/Pathduck/gallery3.git
synced 2026-05-20 03:19:13 -04:00
Refactor all calls of p::clean() to SafeString::of() and p::purify() to SafeString::purify().
Removing any p::clean() calls for arguments to t() and t2() since their args are wrapped in a SafeString anyway.
This commit is contained in:
@@ -89,7 +89,7 @@ class Quick_Controller extends Controller {
|
||||
access::required("view", $item->parent());
|
||||
access::required("edit", $item->parent());
|
||||
|
||||
$msg = t("Made <b>%title</b> this album's cover", array("title" => p::purify($item->title)));
|
||||
$msg = t("Made <b>%title</b> this album's cover", array("title" => SafeString::purify($item->title)));
|
||||
|
||||
item::make_album_cover($item);
|
||||
message::success($msg);
|
||||
@@ -105,10 +105,10 @@ class Quick_Controller extends Controller {
|
||||
if ($item->is_album()) {
|
||||
print t(
|
||||
"Delete the album <b>%title</b>? All photos and movies in the album will also be deleted.",
|
||||
array("title" => p::purify($item->title)));
|
||||
array("title" => SafeString::purify($item->title)));
|
||||
} else {
|
||||
print t("Are you sure you want to delete <b>%title</b>?",
|
||||
array("title" => p::purify($item->title)));
|
||||
array("title" => SafeString::purify($item->title)));
|
||||
}
|
||||
|
||||
$form = item::get_delete_form($item);
|
||||
@@ -122,9 +122,9 @@ class Quick_Controller extends Controller {
|
||||
access::required("edit", $item);
|
||||
|
||||
if ($item->is_album()) {
|
||||
$msg = t("Deleted album <b>%title</b>", array("title" => p::purify($item->title)));
|
||||
$msg = t("Deleted album <b>%title</b>", array("title" => SafeString::purify($item->title)));
|
||||
} else {
|
||||
$msg = t("Deleted photo <b>%title</b>", array("title" => p::purify($item->title)));
|
||||
$msg = t("Deleted photo <b>%title</b>", array("title" => SafeString::purify($item->title)));
|
||||
}
|
||||
|
||||
$parent = $item->parent();
|
||||
|
||||
Reference in New Issue
Block a user