Changeset 15571 for branches

Timestamp:

Jun 5, 2012, 9:55:23 PM (12 years ago)

Author:

mistic100

Message:

merge r15570 from trunk
bug:2645 author field is kept when comment not validated

Location:

branches/2.3

Files:

• include/picture_comment.inc.php (modified) (2 diffs)
• themes/default/template/picture.tpl (modified) (1 diff)

branches/2.3/include/picture_comment.inc.php

@@ -234 +234 @@
   {
     $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',
@@ -244 +245 @@
           'KEY' => $key,
           'CONTENT' => $content,
-          'SHOW_AUTHOR' => !is_classic_user()
+          'SHOW_AUTHOR' => !is_classic_user(),
+          'AUTHOR' => $author ,
         ));
   }

branches/2.3/themes/default/template/picture.tpl

@@ -307 +307 @@
                 <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>