summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/permissions.php
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-08-01 08:31:09 -0700
committerTim Almdal <tnalmdal@shaw.ca>2010-08-01 08:31:09 -0700
commita4531707274318496bb7a4477d940030d870f133 (patch)
tree6715be3db83d7f834676a0b2c7a38c9bd58ce1a5 /modules/gallery/controllers/permissions.php
parentfc580037e797fad48b49fcffa7aa69dca8761972 (diff)
parent7607e1f932dda53144792d0b7e8674a34fbc7f9a (diff)
Merge branch 'dialog' of github.com:gallery/gallery3 into dialog
Diffstat (limited to 'modules/gallery/controllers/permissions.php')
-rw-r--r--modules/gallery/controllers/permissions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/controllers/permissions.php b/modules/gallery/controllers/permissions.php
index 57f5ccb6..fc06cb44 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);
- json::reply(array("form" => (string) $view));
+ print $view;
}
function form($id) {