diff --git a/class2.php b/class2.php index ed656b6c5..db9bc65c1 100644 --- a/class2.php +++ b/class2.php @@ -9,8 +9,8 @@ * General purpose file * * $Source: /cvs_backup/e107_0.8/class2.php,v $ -* $Revision: 1.122 $ -* $Date: 2009-08-08 23:09:08 $ +* $Revision: 1.123 $ +* $Date: 2009-08-09 08:39:26 $ * $Author: marj_nl_fr $ * */ @@ -230,9 +230,9 @@ if (strpos($_SERVER['QUERY_STRING'], ']') && preg_match("#\[(.*?)](.*)#", $_SERV if(strlen(e_MENU) == 2) // language code ie. [fr] { require_once(e_HANDLER."language_class.php"); - $lng = new language; + $slng = new language; define('e_LANCODE', true); - $_GET['elan'] = $lng->convert(e_MENU); + $_GET['elan'] = $slng->convert(e_MENU); } } @@ -519,12 +519,12 @@ if(varset($pref['multilanguage_subdomain']) && ($pref['user_tracking'] == 'sessi { e107_ini_set('session.cookie_domain', '.'.e_DOMAIN); require_once(e_HANDLER.'language_class.php'); - $lng = new language; + $slng = new language; if(!e_SUBDOMAIN) { $GLOBALS['elan'] = $pref['sitelanguage']; } - elseif($eln = $lng->convert(e_SUBDOMAIN)) + elseif($eln = $slng->convert(e_SUBDOMAIN)) { $GLOBALS['elan'] = $eln; } diff --git a/signup.php b/signup.php index 23f441662..85c3af4d7 100644 --- a/signup.php +++ b/signup.php @@ -9,9 +9,9 @@ * User signup * * $Source: /cvs_backup/e107_0.8/signup.php,v $ - * $Revision: 1.37 $ - * $Date: 2009-07-08 01:28:55 $ - * $Author: e107coders $ + * $Revision: 1.38 $ + * $Date: 2009-08-09 08:39:27 $ + * $Author: marj_nl_fr $ * */ @@ -288,8 +288,8 @@ if (e_QUERY) if(isset($qs[3]) && strlen($qs[3]) == 2 ) { require_once(e_HANDLER."language_class.php"); - $lng = new language; - $the_language = $lng->convert($qs[3]); + $slng = new language; + $the_language = $slng->convert($qs[3]); if(is_readable(e_LANGUAGEDIR.$the_language."/lan_signup.php")) { include(e_LANGUAGEDIR.$the_language."/lan_signup.php");