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

- merge trunk r1258:1259 into branch 1.6 (htmlentities())

Browse source 
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1260 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
chrisaga 2006-04-22 15:27:13 +00:00
parent e49879d4b8
commit 854df586db
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/category_subcats.inc.php
View file

@ -149,7 +149,7 @@ SELECT id, path, tn_ext
'categories.category',
array(
'SRC' => $thumbnail_src_of[ $category['picture'] ],
'ALT' => $category['name'],
'ALT' => htmlentities($category['name'],ENT_QUOTES),
'TITLE' => $lang['hint_category'],
'ICON' => get_icon(@$category['date_last']),
@ -159,9 +159,9 @@ SELECT id, path, tn_ext
'cat_name' => $category['name'],
)
),
'NAME' => $category['name'],
'NAME' => htmlentities($category['name'],ENT_QUOTES),
'CAPTION_NB_IMAGES' => (($category['nb_images'] == 0) ? '' : sprintf("%d ".l10n('pictures'), $category['nb_images'])),
'DESCRIPTION' => @$category['comment'],
'DESCRIPTION' => htmlentities(@$category['comment'],ENT_QUOTES),
)
);
}
@ -212,4 +212,4 @@ SELECT id, path, tn_ext
}
}
}
?>
?>

6
include/functions_html.inc.php
View file

@ -450,7 +450,7 @@ function get_html_menu_category($categories)
{
$menu.= ' rel="up"';
}
$menu.= '>'.$category['name'].'</a>';
$menu.= '>'.htmlentities($category['name'],ENT_QUOTES).'</a>';
if ($category['nb_images'] > 0)
{
@ -500,7 +500,7 @@ function parse_comment_content($content)
$replacement = '<span style="font-style:italic;">$1$2</span>';
$content = preg_replace($pattern, $replacement, $content);
$content = '<div>'.$content.'</div>';
$content = '<div>'.htmlentities($content,ENT_QUOTES).'</div>';
return $content;
}
@ -550,7 +550,7 @@ function get_html_tag_selection(
$output.=
' />'
.' '.$tag['name']
.' '. htmlentities($tag['name'],ENT_QUOTES)
.'</label>'
.'</li>'
."\n"