Changeset 10123 for branches/2.2/picture.php

Timestamp:

Apr 6, 2011, 9:31:02 PM (13 years ago)

Author:

mistic100

Message:

merge r10097 & r10122 from trunk

File:

• branches/2.2/picture.php (modified) (4 diffs)

branches/2.2/picture.php

@@ -190 +190 @@
 // +-----------------------------------------------------------------------+
 
+$infos = array();
+
 // caching first_rank, last_rank, current_rank in the displayed
 // section. This should also help in readability.
@@ -332 +334 @@
         if (!empty($_POST['content']))
         {
-          update_user_comment(
+          $comment_action = update_user_comment(
             array(
               'comment_id' => $_GET['comment_to_edit'],
@@ -341 +343 @@
             );
 
-          redirect($url_self);
+          switch ($comment_action)
+          {
+            case 'moderate':
+              array_push($infos, l10n('An administrator must authorize your comment before it is visible.'));
+            case 'validate':
+              array_push($infos, l10n('Your comment has been registered'));
+              break;
+            case 'reject':
+              set_status_header(403);
+              array_push($infos, l10n('Your comment has NOT been registered because it did not pass the validation rules'));
+              break;
+            default:
+              trigger_error('Invalid comment action '.$comment_action, E_USER_WARNING);
+          }
+          
+          $template->assign(
+              ($comment_action=='reject') ? 'errors' : 'infos',
+              $infos
+            );
+            
+          unset($_POST['content']);
+          break;
         }
         else
@@ -835 +858 @@
 }
 
-$infos = array();
-
 // author
 if (!empty($picture['current']['author']))