Merge branch 'master' of git://github.com/gallery/gallery3

2 files changed, 5 insertions, 8 deletions

diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index e20b8ac8..9092ec68 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -60,9 +60,7 @@ class Admin_Tags_Controller extends Admin_Controller {
         array("result" => "success",
               "location" => url::site("admin/tags")));
     } else {
-      print json_encode(
-        array("result" => "error",
-              "form" => $form->__toString()));
+      print json_encode(array("result" => "error", "form" => (string) $form));
     }
   }
 
@@ -99,7 +97,8 @@ class Admin_Tags_Controller extends Admin_Controller {
       message::success($message);
       log::success("tags", $message);
 
-      print json_encode(array("result" => "success"));
+      print json_encode(array("result" => "success",
+              "location" => url::site("admin/tags")));
     } else {
       print json_encode(array("result" => "error", "form" => $in_place_edit->render()));
     }
diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index 992c7411..1eede907 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -69,11 +69,9 @@ class Tags_Controller extends Controller {
 
       print json_encode(
         array("result" => "success",
-              "cloud" => tag::cloud(30)->__toString()));
+              "cloud" => (string)tag::cloud(30)));
     } else {
-      print json_encode(
-        array("result" => "error",
-              "form" => $form->__toString()));
+      print json_encode(array("result" => "error", "form" => (string) $form));
     }
   }