mirror of
https://github.com/Pathduck/gallery3.git
synced 2026-06-16 15:09:55 -04:00
Cast the status message to a string so that it gets sent down as a string in the json blob.
Fixes ticket #1198.
This commit is contained in:
@@ -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)));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user