From 48326ad01708fcfa020283e2ad8b2cae4ede1600 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 17 Sep 2009 12:11:00 -0700
Subject: Cleanup issues with the original fix for #779

---
 modules/tag/controllers/admin_tags.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/tag/controllers')

diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index 3301566b..ced73d65 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -81,7 +81,7 @@ class Admin_Tags_Controller extends Admin_Controller {
       kohana::show_404();
     }
 
-    //Don't use a form as the form is dynamically created in the js
+    // Don't use a form as the form is dynamically created in the js
     $post = new Validation($_POST);
     $post->add_rules("name", "required", "length[1,64]");
     $valid = $post->validate();
@@ -89,7 +89,7 @@ class Admin_Tags_Controller extends Admin_Controller {
       $new_name = $this->input->post("name");
       $new_tag = ORM::factory("tag")->where("name", $new_name)->find();
       if ($new_tag->loaded) {
-        $error_msg = "There is already a tag with that name";
+        $error_msg = t("There is already a tag with that name")->__toString();
         $valid = false;
       }
     } else {
-- 
cgit v1.2.3


From 2eeacd2656083739a588738b28d578e616d46c9c Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 17 Sep 2009 13:55:11 -0700
Subject: use an implicit cast to convert the translated error message to a
 string as it is encoded by the json routines and will be treated as an object
 otherwise

---
 modules/tag/controllers/admin_tags.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/tag/controllers')

diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index ced73d65..b42e3748 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -89,7 +89,7 @@ class Admin_Tags_Controller extends Admin_Controller {
       $new_name = $this->input->post("name");
       $new_tag = ORM::factory("tag")->where("name", $new_name)->find();
       if ($new_tag->loaded) {
-        $error_msg = t("There is already a tag with that name")->__toString();
+        $error_msg = (string)t("There is already a tag with that name");
         $valid = false;
       }
     } else {
-- 
cgit v1.2.3


From d050f0a2466fedfe96c3bbc072374d01b17951c5 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Thu, 17 Sep 2009 14:04:13 -0700
Subject: Minor style fix: (string) $var, not (string)$var, and move the
 explicit cast down where it's needed.

---
 modules/tag/controllers/admin_tags.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/tag/controllers')

diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index b42e3748..63f7957c 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -89,7 +89,7 @@ class Admin_Tags_Controller extends Admin_Controller {
       $new_name = $this->input->post("name");
       $new_tag = ORM::factory("tag")->where("name", $new_name)->find();
       if ($new_tag->loaded) {
-        $error_msg = (string)t("There is already a tag with that name");
+        $error_msg = t("There is already a tag with that name");
         $valid = false;
       }
     } else {
@@ -115,7 +115,7 @@ class Admin_Tags_Controller extends Admin_Controller {
     } else {
       print json_encode(
         array("result" => "error",
-              "message" => $error_msg));
+              "message" => (string) $error_msg));
     }
   }
 }
-- 
cgit v1.2.3