diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-26 09:58:57 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-26 09:58:57 -0800 |
| commit | f28b80fcf43e02ca65f419eb6774321dc30a2a37 (patch) | |
| tree | 34d3e44e5716751f71d10de623228bd541b487ae /modules/server_add/controllers/server_add.php | |
| parent | 9f810150532a2511bfc5f03c9d24fd592d2f803f (diff) | |
| parent | b4922f4d176662976c9d2b249edf0e50a0cdfdf1 (diff) | |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/server_add/controllers/server_add.php')
| -rw-r--r-- | modules/server_add/controllers/server_add.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php index f68335df..4cdaa275 100644 --- a/modules/server_add/controllers/server_add.php +++ b/modules/server_add/controllers/server_add.php @@ -109,9 +109,11 @@ class Server_Add_Controller extends Admin_Controller { } $task = task::run($task_id); + // 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, - "percent_complete" => $task->percent_complete)); + "percent_complete" => sprintf("%F", $task->percent_complete))); } /** |