merge r6437 from trunk to branch 2.1

- do not remove slashes before calling insert_user_comment (homogeneity with update_user_comment and general use of slashes in piwigo)
- when using a modifier on a non array variable use @| instead of | (generated code is simpler and faster)

git-svn-id: http://piwigo.org/svn/branches/2.1@6438 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2010-06-01 19:56:07 +00:00
parent cf32601902
commit 663c13f39a
5 changed files with 8 additions and 23 deletions
+3 -3
View File
@@ -46,8 +46,8 @@ if ( $page['show_comments'] and isset( $_POST['content'] ) )
}
$comm = array(
'author' => trim( stripslashes(@$_POST['author']) ),
'content' => trim( stripslashes($_POST['content']) ),
'author' => trim( @$_POST['author'] ),
'content' => trim( $_POST['content'] ),
'image_id' => $page['image_id'],
);
@@ -237,7 +237,7 @@ SELECT
$content = '';
if ('reject'===@$comment_action)
{
$content = htmlspecialchars($comm['content']);
$content = htmlspecialchars( stripslashes($comm['content']) );
}
$template->assign('comment_add',
array(