diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-07-03 09:26:31 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-07-03 09:26:31 -0700 |
| commit | 715d714ade637b6292bab378c4d7deb332542477 (patch) | |
| tree | 5ef6af71c9ac21d557abca8f7895a85d2a20e929 /modules/comment/controllers/comments.php | |
| parent | bd1b2f414741bb9bb68c8f94a291bedd5c9925c0 (diff) | |
| parent | 0f9bfbdd572c44ab6b095e18f376c6d340f5fd26 (diff) | |
Merge branch 'master' of git@github.com:/gallery/gallery3
Diffstat (limited to 'modules/comment/controllers/comments.php')
| -rw-r--r-- | modules/comment/controllers/comments.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php index 2840ba67..02c38491 100644 --- a/modules/comment/controllers/comments.php +++ b/modules/comment/controllers/comments.php @@ -41,7 +41,7 @@ class Comments_Controller extends REST_Controller { "id" => $comment->id, "author_name" => p::clean($comment->author_name()), "created" => $comment->created, - "text" => p::purify($comment->text)); + "text" => nl2br(p::purify($comment->text))); } print json_encode($data); break; @@ -128,7 +128,7 @@ class Comments_Controller extends REST_Controller { "id" => $comment->id, "author_name" => p::clean($comment->author_name()), "created" => $comment->created, - "text" => p::purify($comment->text)))); + "text" => nl2br(p::purify($comment->text))))); } else { $view = new Theme_View("comment.html", "fragment"); $view->comment = $comment; |