aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2012-06-05 19:55:23 +0000
committermistic100 <mistic@piwigo.org>2012-06-05 19:55:23 +0000
commit0a454adbf65947398e4a364a376cf2874fb8a118 (patch)
treea6200d5c6a3d108e6d302dc1268aca7825271432 /include
parent024b5944d2a543683ce03a86af319ecf8a3e4fa3 (diff)
merge r15570 from trunk
bug:2645 author field is kept when comment not validated git-svn-id: http://piwigo.org/svn/branches/2.3@15571 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/picture_comment.inc.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/picture_comment.inc.php b/include/picture_comment.inc.php
index 064e02056..9e52f0126 100644
--- a/include/picture_comment.inc.php
+++ b/include/picture_comment.inc.php
@@ -233,17 +233,19 @@ SELECT
if ($show_add_comment_form)
{
$key = get_ephemeral_key(3, $page['image_id']);
- $content = '';
+ $content = $author = '';
if ('reject'===@$comment_action)
{
$content = htmlspecialchars( stripslashes($comm['content']) );
+ $author = htmlspecialchars( stripslashes($comm['author']) );
}
$template->assign('comment_add',
array(
'F_ACTION' => $url_self,
'KEY' => $key,
'CONTENT' => $content,
- 'SHOW_AUTHOR' => !is_classic_user()
+ 'SHOW_AUTHOR' => !is_classic_user(),
+ 'AUTHOR' => $author ,
));
}
}