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
Piwigo · Jul 27, 2010 · a61e471 · a61e471
1 parent aadf746
commit a61e471
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/admin/element_set_unit.php b/admin/element_set_unit.php
@@ -67,7 +67,7 @@
     $data['author'] = $_POST['author-'.$row['id']];
     $data['level'] = $_POST['level-'.$row['id']];
 
-    foreach (array('name', 'author', 'level') as $field)
+    foreach (array('name', 'level') as $field)
     {
       if (!empty($_POST[$field.'-'.$row['id']]))
       {
@@ -238,7 +238,7 @@
             PHPWG_ROOT_PATH.'admin.php?page=picture_modify'.
             '&amp;image_id='.$row['id'],
         'NAME' => !empty($row['name'])?$row['name']:'',
-        'AUTHOR' => !empty($row['author'])?$row['author']:'',
+        'AUTHOR' => !empty($row['author'])?htmlspecialchars($row['author']):'',
         'LEVEL' => !empty($row['level'])?$row['level']:'0',
         'DESCRIPTION' => !empty($row['comment'])?$row['comment']:'',
         'DATE_CREATION_YEAR' => $year,

diff --git a/admin/picture_modify.php b/admin/picture_modify.php
@@ -236,7 +236,11 @@
 
     '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']) ?

diff --git a/themes/default/template/header.tpl b/themes/default/template/header.tpl
@@ -5,7 +5,7 @@
 <meta name="generator" content="Piwigo (aka PWG), see piwigo.org">
 {if isset($meta_ref) } 
 {if isset($INFO_AUTHOR)}
-<meta name="author" content="{$INFO_AUTHOR|@replace:'"':' '}">
+<meta name="author" content="{$INFO_AUTHOR|@strip_tags:false|@replace:'"':' '}">
 {/if}
 {if isset($related_tags)}
 <meta name="keywords" content="{foreach from=$related_tags item=tag name=tag_loop}{if !$smarty.foreach.tag_loop.first}, {/if}{$tag.name}{/foreach}">