Changeset 15570

Timestamp:

Jun 5, 2012, 9:51:54 PM (12 years ago)

Author:

mistic100

Message:

bug:2645 author field is kept when comment not validated

Location:

trunk

Files:

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

trunk/include/picture_comment.inc.php

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

trunk/themes/default/template/picture.tpl

@@ -348 +348 @@
                         <form method="post" action="{$comment_add.F_ACTION}" id="addComment">
                                 {if $comment_add.SHOW_AUTHOR}
-                                        <p><label>{'Author'|@translate} :</label></p>
-                                        <p><input type="text" name="author"></p>
-                                        <p><label>{'Comment'|@translate} :</label></p>
+                                        <p><label for="author">{'Author'|@translate} :</label></p>
+                                        <p><input type="text" name="author" id="author" value="{$comment_add.AUTHOR}"></p>
+                                        <p><label for="contentid">{'Comment'|@translate} :</label></p>
                                 {/if}
                                 <p><textarea name="content" id="contentid" rows="5" cols="50">{$comment_add.CONTENT}</textarea></p>