adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-07 17:23:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge r15570 from trunk

Browse Source 
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
This commit is contained in:
mistic100
2012-06-05 19:55:23 +00:00
parent 024b5944d2
commit 0a454adbf6
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/picture_comment.inc.php
+4 -2
View File
@@ -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 ,
));
}
}
themes/default/template/picture.tpl
+1 -1
View File
@@ -306,7 +306,7 @@ y.callService(
<fieldset>
<legend>{'Add a comment'|@translate}</legend>
{if $comment_add.SHOW_AUTHOR}
<label>{'Author'|@translate}<input type="text" name="author"></label>
<label>{'Author'|@translate}<input type="text" name="author" value="{$comment_add.AUTHOR}"></label>
{/if}
<label>{'Comment'|@translate}<textarea name="content" id="contentid" rows="5" cols="80">{$comment_add.CONTENT}</textarea></label>
<input type="hidden" name="key" value="{$comment_add.KEY}">