Changeset 1102

Timestamp:

Mar 25, 2006, 6:29:03 PM (18 years ago)

Author:

chrisaga

Message:

-improvement : function l10n renamed raw_l10n, new function l10n uses raw_l10n and returns a string with
all html entities transcoded. We should use l10n everywere instead of $lang...

File:

• trunk/include/functions.inc.php (modified) (1 diff)

trunk/include/functions.inc.php

@@ -748 +748 @@
  * @return string
  */
+function raw_l10n($key)
+{
+  global $lang, $conf;
+
+  if ($conf['debug_l10n'] and !isset($lang[$key]))
+  {
+    echo '[l10n] language key "'.$key.'" is not defined<br />';
+  }
+
+  return isset($lang[$key]) ? $lang[$key] : $key;
+}
+/**
+ * Like l10n but converts html entities
+ *
+ * @param string key
+ * @return string
+ */
 function l10n($key)
 {
-  global $lang, $conf;
-
-  if ($conf['debug_l10n'] and !isset($lang[$key]))
-  {
-    echo '[l10n] language key "'.$key.'" is not defined<br />';
-  }
-
-  return isset($lang[$key]) ? $lang[$key] : $key;
+  return htmlentities(raw_l10n($key),ENT_QUOTES);
 }