diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-01-28 20:44:10 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-01-28 20:44:10 -0800 |
| commit | 3ed81869cbbf021a11868f612ffc79c031df42f2 (patch) | |
| tree | 2b1edb05b510669b32e6d81f1d1dfeac70ef5294 /modules | |
| parent | e7cfbfe376a117623e7e54a3f4469495a13e1a77 (diff) | |
Cast the SafeString $task->status to (string) so that it doesn't come
down to the JS as an object.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gallery/controllers/admin_maintenance.php | 4 |
1 files changed, 2 insertions, 2 deletions
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))); } } |