archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug 1757 fixed: ability to use HTML in author field

Browse source 
git-svn-id: http://piwigo.org/svn/branches/2.1@6713 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2010-07-27 12:37:12 +00:00
parent 7a7569eda2
commit 41757b9e1a
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
admin/element_set_unit.php
View file

@ -67,7 +67,7 @@ SELECT id, date_creation
$data['author'] = $_POST['author-'.$row['id']]; $data['author'] = $_POST['author-'.$row['id']];
$data['level'] = $_POST['level-'.$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']])) if (!empty($_POST[$field.'-'.$row['id']]))
{ {
@ -238,7 +238,7 @@ SELECT
PHPWG_ROOT_PATH.'admin.php?page=picture_modify'. PHPWG_ROOT_PATH.'admin.php?page=picture_modify'.
'&image_id='.$row['id'], '&image_id='.$row['id'],
'NAME' => !empty($row['name'])?$row['name']:'', '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', 'LEVEL' => !empty($row['level'])?$row['level']:'0',
'DESCRIPTION' => !empty($row['comment'])?$row['comment']:'', 'DESCRIPTION' => !empty($row['comment'])?$row['comment']:'',
'DATE_CREATION_YEAR' => $year, 'DATE_CREATION_YEAR' => $year,

6
admin/picture_modify.php
View file

@ -236,7 +236,11 @@ $template->assign(
'REGISTRATION_DATE' => format_date($row['date_available']), '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' => 'DESCRIPTION' =>
htmlspecialchars( isset($_POST['description']) ? htmlspecialchars( isset($_POST['description']) ?

2
themes/default/template/header.tpl
View file

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