Merge branch 'master' of git.tokyo.tequila.jp:/var/lib/git/php_core

www/libs/Class.Basic.inc

@@ -313,7 +313,7 @@
 			if (!session_id())
 			{
 				// check if we have an external session name given, else skip this step
-				if (isset($GLOBALS['SET_SESSION_NAME']))
+				if (SET_SESSION_NAME)
 				{
 					// set the session name for possible later check
 					$this->session_name = SET_SESSION_NAME;

www/libs/Class.l10n.inc

@@ -105,5 +105,15 @@
 		{
 			return $this->l10n->ngettext($single, $plural, $number);
 		}
+
+		public function __get_lang()
+		{
+			return $this->lang;
+		}
+
+		public function __get_mofile()
+		{
+			return $this->mofile;
+		}
 	}
 ?>