diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-07-13 12:30:03 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-07-13 12:30:03 -0700 |
| commit | 887154a3b797eade36c1c651e2e849c613459544 (patch) | |
| tree | 835214c5c76dbfa2b1de584a6f3f58235a0009ad /modules/gallery/controllers/admin_maintenance.php | |
| parent | 5eb4b8ff6cae33d83cfef8ea3d41cba4352e65d8 (diff) | |
| parent | 69dfb51490b62bd639c8e09461fad15f4fb51650 (diff) | |
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/controllers/admin_maintenance.php')
| -rw-r--r-- | modules/gallery/controllers/admin_maintenance.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php index d6a2d191..489f5d54 100644 --- a/modules/gallery/controllers/admin_maintenance.php +++ b/modules/gallery/controllers/admin_maintenance.php @@ -64,7 +64,7 @@ class Admin_Maintenance_Controller extends Admin_Controller { log::info("tasks", t("Task %task_name started (task id %task_id)", array("task_name" => $task->name, "task_id" => $task->id)), html::anchor("admin/maintenance", t("maintenance"))); - print $view; + print json_encode(array("form" => (string) $view)); } /** @@ -86,7 +86,7 @@ class Admin_Maintenance_Controller extends Admin_Controller { log::info("tasks", t("Task %task_name resumed (task id %task_id)", array("task_name" => $task->name, "task_id" => $task->id)), html::anchor("admin/maintenance", t("maintenance"))); - print $view; + print json_encode(array("form" => (string) $view)); } /** @@ -103,7 +103,7 @@ class Admin_Maintenance_Controller extends Admin_Controller { $view = new View("admin_maintenance_show_log.html"); $view->task = $task; - print $view; + print json_encode(array("form" => (string) $view)); } /** |