merge r22660 from branch 2.5 to trunk

feature 2899: ability to allow HTML in EXIF/IPTC (disabled by default)



git-svn-id: http://piwigo.org/svn/trunk@22661 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2013-05-14 08:05:06 +00:00
parent 348ab67a88
commit 206d9bee4c
2 changed files with 25 additions and 8 deletions
+5
View File
@@ -374,6 +374,11 @@ $conf['use_exif_mapping'] = array(
'date_creation' => 'DateTimeOriginal'
);
// allow_html_in_metadata: in case the origin of the photo is unsecure (user
// upload), we remove HTML tags to avoid XSS (malicious execution of
// javascript)
$conf['allow_html_in_metadata'] = false;
// +-----------------------------------------------------------------------+
// | sessions |
// +-----------------------------------------------------------------------+