Changeset 1291 for branches/branch-1_6/include/functions.inc.php

Timestamp:

Apr 29, 2006, 12:36:49 PM (18 years ago)

Author:

chrisaga

Message:

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

File:

• branches/branch-1_6/include/functions.inc.php (modified) (2 diffs)

branches/branch-1_6/include/functions.inc.php

@@ -800 +800 @@
  * @return string
  */
-function raw_l10n($key)
+function l10n($key)
 {
   global $lang, $conf;
@@ -810 +810 @@
 
   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);
 }