aboutsummaryrefslogtreecommitdiffstats
path: root/admin/picture_modify.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-07-27 12:37:38 +0000
committerplegall <plg@piwigo.org>2010-07-27 12:37:38 +0000
commita61e471e02b901727842745304b52f5c357734e8 (patch)
treedaa2c91884e14bfbbc9ad60092ebd73b7f6b9bf3 /admin/picture_modify.php
parentaadf746e49231df14c4a94ca31f9eb2979d9faed (diff)
merge r6713 from branch 2.1 to trunk
bug 1757 fixed: ability to use HTML in author field git-svn-id: http://piwigo.org/svn/trunk@6714 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/picture_modify.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/admin/picture_modify.php b/admin/picture_modify.php
index a764f0bdb..4d15a9206 100644
--- a/admin/picture_modify.php
+++ b/admin/picture_modify.php
@@ -236,7 +236,11 @@ $template->assign(
'REGISTRATION_DATE' => format_date($row['date_available']),
- 'AUTHOR' => isset($_POST['author']) ? $_POST['author'] : @$row['author'],
+ 'AUTHOR' => htmlspecialchars(
+ isset($_POST['author'])
+ ? stripslashes($_POST['author'])
+ : @$row['author']
+ ),
'DESCRIPTION' =>
htmlspecialchars( isset($_POST['description']) ?