aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchrisaga <chrisaga@piwigo.org>2006-04-29 10:29:32 +0000
committerchrisaga <chrisaga@piwigo.org>2006-04-29 10:29:32 +0000
commitd05caccc318410e0e1321e9c0d0d29983c8e4cf5 (patch)
tree5a7b1737a74f8067a5ccefcd1b11ce335731cd25
parent360e21242f78ae87466996febff2b5edbf0c33f7 (diff)
bug 358 fixed : Accent are not correctly displayed in category listing
Removed calls to htmlentities() improvement : charset added in HTTP header so browser's automatic encoding works even if httpd is not netto latin1 revert to original l10n() : use of htmlentities() didn't solve bug in IE tooltips git-svn-id: http://piwigo.org/svn/trunk@1290 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/category_subcats.inc.php4
-rw-r--r--include/functions.inc.php12
-rw-r--r--include/functions_html.inc.php4
-rw-r--r--include/page_header.php1
4 files changed, 6 insertions, 15 deletions
diff --git a/include/category_subcats.inc.php b/include/category_subcats.inc.php
index 578cabde6..60a7c4225 100644
--- a/include/category_subcats.inc.php
+++ b/include/category_subcats.inc.php
@@ -149,7 +149,7 @@ SELECT id, path, tn_ext
'categories.category',
array(
'SRC' => $thumbnail_src_of[ $category['picture'] ],
- 'ALT' => htmlentities($category['name'],ENT_QUOTES),
+ 'ALT' => $category['name'],
'TITLE' => $lang['hint_category'],
'ICON' => get_icon(@$category['date_last']),
@@ -159,7 +159,7 @@ SELECT id, path, tn_ext
'cat_name' => $category['name'],
)
),
- 'NAME' => htmlentities($category['name'],ENT_QUOTES),
+ 'NAME' => $category['name'],
'CAPTION_NB_IMAGES' => (($category['nb_images'] == 0) ? '' : sprintf("%d ".l10n('pictures'), $category['nb_images'])),
'DESCRIPTION' => @$category['comment'],
)
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 166b0798f..1a71112f7 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -799,7 +799,7 @@ function get_name_from_file($filename)
* @param string key
* @return string
*/
-function raw_l10n($key)
+function l10n($key)
{
global $lang, $conf;
@@ -810,16 +810,6 @@ function raw_l10n($key)
return isset($lang[$key]) ? $lang[$key] : $key;
}
-/**
- * Like l10n but converts html entities
- *
- * @param string key
- * @return string
- */
-function l10n($key)
-{
- return htmlentities(raw_l10n($key),ENT_QUOTES);
-}
/**
* returns the corresponding value from $themeconf if existing. Else, the
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 65cbc879c..7db40add4 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -450,7 +450,7 @@ function get_html_menu_category($categories)
{
$menu.= ' rel="up"';
}
- $menu.= '>'.htmlentities($category['name'],ENT_QUOTES).'</a>';
+ $menu.= '>'.$category['name'].'</a>';
if ($category['nb_images'] > 0)
{
@@ -550,7 +550,7 @@ function get_html_tag_selection(
$output.=
' />'
- .' '. htmlentities($tag['name'],ENT_QUOTES)
+ .' '. $tag['name']
.'</label>'
.'</li>'
."\n"
diff --git a/include/page_header.php b/include/page_header.php
index 4527f1563..b793c6a58 100644
--- a/include/page_header.php
+++ b/include/page_header.php
@@ -64,5 +64,6 @@ if ( isset( $refresh ) and intval($refresh) >= 0 and isset( $url_link ) and isse
$template->assign_block_vars('refresh', array());
}
+header('Content-Type: text/html; charset='.$lang_info['charset']);
$template->parse('header');
?>