summaryrefslogtreecommitdiff
path: root/modules/tag/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'modules/tag/controllers')
-rw-r--r--modules/tag/controllers/admin_tags.php8
-rw-r--r--modules/tag/controllers/tags.php2
2 files changed, 5 insertions, 5 deletions
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index 32c54945..0c82579b 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -37,7 +37,7 @@ class Admin_Tags_Controller extends Admin_Controller {
public function form_delete($id) {
$tag = ORM::factory("tag", $id);
if ($tag->loaded()) {
- json::reply(array("form" => (string) tag::get_delete_form($tag)));
+ print tag::get_delete_form($tag);
}
}
@@ -59,7 +59,7 @@ class Admin_Tags_Controller extends Admin_Controller {
json::reply(array("result" => "success", "location" => url::site("admin/tags")));
} else {
- json::reply(array("result" => "error", "form" => (string) $form));
+ print $form;
}
}
@@ -91,14 +91,14 @@ class Admin_Tags_Controller extends Admin_Controller {
$tag->name = $in_place_edit->value();
$tag->save();
- $message = t("Renamed tag %old_name to %new_name",
+ $message = t("Renamed tag <b>%old_name</b> to <b>%new_name</b>",
array("old_name" => $old_name, "new_name" => $tag->name));
message::success($message);
log::success("tags", $message);
json::reply(array("result" => "success", "location" => url::site("admin/tags")));
} else {
- json::reply(array("result" => "error", "form" => $in_place_edit->render()));
+ json::reply(array("result" => "error", "form" => (string)$in_place_edit->render()));
}
}
diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index 7fa8534c..bc657644 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -69,7 +69,7 @@ class Tags_Controller extends Controller {
json::reply(array("result" => "success", "cloud" => (string)tag::cloud(30)));
} else {
- json::reply(array("result" => "error", "form" => (string) $form));
+ json::reply(array("result" => "error", "html" => (string)$form));
}
}