diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-07-02 18:00:22 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-07-02 18:00:22 -0700 |
| commit | eb5538d1357dade9e6e08d1b603033928944011c (patch) | |
| tree | ee04f9be38a40f4125eafab5367bba6cf1b61164 /modules/tag | |
| parent | 1a5fe42b555d51d22bde1521100a31d2b434486b (diff) | |
| parent | a633c134b754305eaa611c5d67af4ca7c79beafe (diff) | |
Merge branch 'master' of git@github.com:/gallery/gallery3
Conflicts:
modules/server_add/controllers/admin_server_add.php
Diffstat (limited to 'modules/tag')
| -rw-r--r-- | modules/tag/controllers/admin_tags.php | 6 | ||||
| -rw-r--r-- | modules/tag/helpers/tag_theme.php | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php index af5055ff..dcdc16b9 100644 --- a/modules/tag/controllers/admin_tags.php +++ b/modules/tag/controllers/admin_tags.php @@ -53,8 +53,8 @@ class Admin_Tags_Controller extends Admin_Controller { $name = $tag->name; Database::instance()->delete("items_tags", array("tag_id" => "$tag->id")); $tag->delete(); - message::success(t("Deleted tag %tag_name", array("tag_name" => $name))); - log::success("tags", t("Deleted tag %tag_name", array("tag_name" => $name))); + message::success(t("Deleted tag %tag_name", array("tag_name" => p::clean($name)))); + log::success("tags", t("Deleted tag %tag_name", array("tag_name" => p::clean($name)))); print json_encode( array("result" => "success", @@ -98,7 +98,7 @@ class Admin_Tags_Controller extends Admin_Controller { $tag->save(); $message = t("Renamed tag %old_name to %new_name", - array("old_name" => $old_name, "new_name" => $tag->name)); + array("old_name" => p::clean($old_name), "new_name" => p::clean($tag->name))); message::success($message); log::success("tags", $message); diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php index b48ad178..fe30354f 100644 --- a/modules/tag/helpers/tag_theme.php +++ b/modules/tag/helpers/tag_theme.php @@ -28,9 +28,6 @@ class tag_theme_Core { static function sidebar_blocks($theme) { // @todo this needs to be data driven - if (!$theme->item()) { - return; - } $block = new Block(); $block->css_id = "gTag"; @@ -38,7 +35,7 @@ class tag_theme_Core { $block->content = new View("tag_block.html"); $block->content->cloud = tag::cloud(30); - if ($theme->page_type() != "tag" && access::can("edit", $theme->item())) { + if ($theme->item() && $theme->page_type() != "tag" && access::can("edit", $theme->item())) { $controller = new Tags_Controller(); $block->content->form = tag::get_add_form($theme->item()); } else { |