From ca230a6f53e3a102faf5cb3633465ee8fc326663 Mon Sep 17 00:00:00 2001 From: mistic100 Date: Sun, 18 Dec 2011 21:46:24 +0000 Subject: feature:2538 Make a unified messages management use only $page['infos'] and $page['errors'] vars and and necessary template to all main pages git-svn-id: http://piwigo.org/svn/trunk@12764 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/picture_comment.inc.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'include/picture_comment.inc.php') diff --git a/include/picture_comment.inc.php b/include/picture_comment.inc.php index 064e02056..0273e7b71 100644 --- a/include/picture_comment.inc.php +++ b/include/picture_comment.inc.php @@ -53,28 +53,23 @@ if ( $page['show_comments'] and isset( $_POST['content'] ) ) include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php'); - $comment_action = insert_user_comment($comm, @$_POST['key'], $infos ); + $comment_action = insert_user_comment($comm, @$_POST['key'], $page['infos']); switch ($comment_action) { case 'moderate': - array_push( $infos, l10n('An administrator must authorize your comment before it is visible.') ); + array_push($page['infos'], l10n('An administrator must authorize your comment before it is visible.') ); case 'validate': - array_push( $infos, l10n('Your comment has been registered')); + array_push($page['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') ); + array_push($page['errors'], 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 - ); - // allow plugins to notify what's going on trigger_action( 'user_comment_insertion', array_merge($comm, array('action'=>$comment_action) ) -- cgit v1.2.3