summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-07-10 14:03:46 -0700
committerBharat Mediratta <bharat@menalto.com>2010-07-10 14:03:46 -0700
commitfe8cb89ac4d4294fcd8c28a0d16b25226b4f2e25 (patch)
tree94a04e15471d1bface05cd99a590d055827f0d86 /modules
parent7ca201b11819ca5bfbcbe76f43bfe7d706c0f27f (diff)
Cast the status message to a string so that it gets sent down as a string in the json blob.
Fixes ticket #1198.
Diffstat (limited to 'modules')
-rw-r--r--modules/server_add/controllers/server_add.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 0a691c8a..62c01143 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -93,7 +93,7 @@ class Server_Add_Controller extends Admin_Controller {
print json_encode(
array("result" => "started",
- "status" => $task->status,
+ "status" => (string)$task->status,
"url" => url::site("server_add/run/$task->id?csrf=" . access::csrf_token())));
}
@@ -112,7 +112,7 @@ class Server_Add_Controller extends Admin_Controller {
// Prevent the JavaScript code from breaking by forcing a period as
// decimal separator for all locales with sprintf("%F", $value).
print json_encode(array("done" => (bool)$task->done,
- "status" => $task->status,
+ "status" => (string)$task->status,
"percent_complete" => sprintf("%F", $task->percent_complete)));
}