- merge trunk r1289:1290 into branch 1.6 (bug 358 fixed)

git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1291 68402e56-0260-453c-a942-63ccdbb3a9ee

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