From 3ed81869cbbf021a11868f612ffc79c031df42f2 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Thu, 28 Jan 2010 20:44:10 -0800 Subject: Cast the SafeString $task->status to (string) so that it doesn't come down to the JS as an object. --- modules/gallery/controllers/admin_maintenance.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php index aa4fb29f..3062ea09 100644 --- a/modules/gallery/controllers/admin_maintenance.php +++ b/modules/gallery/controllers/admin_maintenance.php @@ -215,7 +215,7 @@ class Admin_Maintenance_Controller extends Admin_Controller { print json_encode(array("result" => "success", "task" => array( "percent_complete" => $task->percent_complete, - "status" => $task->status, + "status" => (string) $task->status, "done" => (bool) $task->done), "location" => url::site("admin/maintenance"))); @@ -223,7 +223,7 @@ class Admin_Maintenance_Controller extends Admin_Controller { print json_encode(array("result" => "in_progress", "task" => array( "percent_complete" => $task->percent_complete, - "status" => $task->status, + "status" => (string) $task->status, "done" => (bool) $task->done))); } } -- cgit v1.2.3