aboutsummaryrefslogtreecommitdiffstats
path: root/include/picture_comment.inc.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2010-06-01 19:56:07 +0000
committerrvelices <rv-github@modusoptimus.com>2010-06-01 19:56:07 +0000
commit663c13f39af9e50f59ee907ade4aaf4add0d8d01 (patch)
treea860fcdbeadefcaec8d3dc2c59215d1751455784 /include/picture_comment.inc.php
parentcf32601902f8034e111196b4462ec30fb2d41577 (diff)
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
Diffstat (limited to 'include/picture_comment.inc.php')
-rw-r--r--include/picture_comment.inc.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/picture_comment.inc.php b/include/picture_comment.inc.php
index ac0cd9356..cc4970a34 100644
--- a/include/picture_comment.inc.php
+++ b/include/picture_comment.inc.php
@@ -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(