[geeklog-hg] geeklog: Fixed a bug where replying to a comment and inputing th...

[geeklog-cvs at lists.geeklog.net]

changeset 8907:b9e27b3641fb
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/b9e27b3641fb
user: Kenji ITO <mystralkk at gmail.com>
date: Fri Dec 28 19:53:50 2012 +0900
description:
Fixed a bug where replying to a comment and inputing the incorrect captcha code results in page in a page (bug #1527)

diffstat:

 system/lib-story.php |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (15 lines):

diff -r 6d815459f12f -r b9e27b3641fb system/lib-story.php
--- a/system/lib-story.php	Fri Dec 28 20:52:06 2012 +0900
+++ b/system/lib-story.php	Fri Dec 28 19:53:50 2012 +0900
@@ -1324,7 +1324,10 @@
         // FIXME: some failures should not return to comment form
         $retval .= CMT_commentForm($title, $comment, $id, $pid, 'article',
                                   $LANG03[14], $postmode);
-        $retval = COM_createHTMLDocument($retval, array('pagetitle' => $LANG03[1]));
+
+        if (!defined('COMMENT_ON_SAME_PAGE')) {
+            $retval = COM_createHTMLDocument($retval, array('pagetitle' => $LANG03[1]));
+        }
     } else { // success
         $comments = DB_count($_TABLES['comments'], array('type', 'sid'), array('article', $id));
         DB_change($_TABLES['stories'], 'comments', $comments, 'sid', $id);