summaryrefslogtreecommitdiff
path: root/modules/exif/controllers/exif.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-07-13 12:30:03 -0700
committerBharat Mediratta <bharat@menalto.com>2010-07-13 12:30:03 -0700
commit887154a3b797eade36c1c651e2e849c613459544 (patch)
tree835214c5c76dbfa2b1de584a6f3f58235a0009ad /modules/exif/controllers/exif.php
parent5eb4b8ff6cae33d83cfef8ea3d41cba4352e65d8 (diff)
parent69dfb51490b62bd639c8e09461fad15f4fb51650 (diff)
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/exif/controllers/exif.php')
-rw-r--r--modules/exif/controllers/exif.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/exif/controllers/exif.php b/modules/exif/controllers/exif.php
index 2fe875e3..fe5b2ff4 100644
--- a/modules/exif/controllers/exif.php
+++ b/modules/exif/controllers/exif.php
@@ -28,6 +28,6 @@ class Exif_Controller extends Controller {
$view = new View("exif_dialog.html");
$view->details = exif::get($item);
- print $view;
+ print json_encode(array("form" => (string) $view));
}
}