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/permissions.php | |
| parent | 5eb4b8ff6cae33d83cfef8ea3d41cba4352e65d8 (diff) | |
| parent | 69dfb51490b62bd639c8e09461fad15f4fb51650 (diff) | |
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/controllers/permissions.php')
| -rw-r--r-- | modules/gallery/controllers/permissions.php | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/modules/gallery/controllers/permissions.php b/modules/gallery/controllers/permissions.php index fc06cb44..8fdda7b2 100644 --- a/modules/gallery/controllers/permissions.php +++ b/modules/gallery/controllers/permissions.php @@ -33,7 +33,7 @@ class Permissions_Controller extends Controller {      $view->parents = $item->parents();      $view->form = $this->_get_form($item); -    print $view; +    print json_encode(array("form" => (string) $view));    }    function form($id) { | 
