diff options
author | Bharat Mediratta <bharat@menalto.com> | 2009-08-30 16:20:52 -0700 |
---|---|---|
committer | Bharat Mediratta <bharat@menalto.com> | 2009-08-30 16:20:52 -0700 |
commit | 7015948357f91e79bb10595cd7c6bc2513d0863e (patch) | |
tree | d272757f1dc1e38426eeea80399b6313ea247adc /modules/comment/controllers | |
parent | 74e204b557618520d7bc56266a25d230946f02e7 (diff) | |
parent | e4eedadcbb42e831f9649e6b52bd1ee9bf86f544 (diff) |
Merge branch 'master' of git@github.com:/gallery/gallery3
Diffstat (limited to 'modules/comment/controllers')
-rw-r--r-- | modules/comment/controllers/comments.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php index 9fb4796e..82b12893 100644 --- a/modules/comment/controllers/comments.php +++ b/modules/comment/controllers/comments.php @@ -39,9 +39,9 @@ class Comments_Controller extends REST_Controller { foreach ($comments as $comment) { $data[] = array( "id" => $comment->id, - "author_name" => p::clean($comment->author_name()), + "author_name" => html::clean($comment->author_name()), "created" => $comment->created, - "text" => nl2br(p::purify($comment->text))); + "text" => nl2br(html::purify($comment->text))); } print json_encode($data); break; @@ -126,9 +126,9 @@ class Comments_Controller extends REST_Controller { array("result" => "success", "data" => array( "id" => $comment->id, - "author_name" => p::clean($comment->author_name()), + "author_name" => html::clean($comment->author_name()), "created" => $comment->created, - "text" => nl2br(p::purify($comment->text))))); + "text" => nl2br(html::purify($comment->text))))); } else { $view = new Theme_View("comment.html", "fragment"); $view->comment = $comment; |