summaryrefslogtreecommitdiff
path: root/modules/organize
diff options
context:
space:
mode:
authorChad Kieffer <ckieffer@gmail.com>2009-06-03 19:01:57 -0600
committerChad Kieffer <ckieffer@gmail.com>2009-06-03 19:01:57 -0600
commit3845dba196e4684b188c1fda9ee328ce70a3e7a8 (patch)
treea0466988aa45732a25fc8138d50129e64524ff32 /modules/organize
parent6fa9a43d8781565c478c25282ac18a0c1d3a503b (diff)
parentdd854379c20722a763ae7fe3d097a57a544cae80 (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/organize')
-rw-r--r--modules/organize/controllers/organize.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 43d41357..57709cb5 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -61,8 +61,9 @@ class Organize_Controller extends Controller {
access::required("view", $item);
access::required("edit", $item);
- print json_encode(array("title" => $item->title,
- "description" => empty($item->description) ? "" : $item->description));
+ print json_encode(
+ array("title" => p::clean($item->title),
+ "description" => empty($item->description) ? "" : p::clean($item->description)));
}
function tree($item, $parent) {