Possible work-around added to prevent fatal error if no admins-functions.php is loaded

[mailer.git] / inc / language.php

diff --git a/inc/language.php b/inc/language.php
index 3e43e41c4cd72caf480ec8657bb0fbf8470d7e89..fdb0d6dbec9916950f6732e64124c3d7e543c7fe 100644 (file)
--- a/inc/language.php
+++ b/inc/language.php
@@ -38,37 +38,36 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
 // Try to get language from session
-$mx_lang = get_session('mx_lang');
+$mx_lang = getSession('mx_lang');
 
 // Set default language if it is not (yet) set
-if (is_null($mx_lang)) $mx_lang = constant('DEFAULT_LANG');
+if (is_null($mx_lang)) $mx_lang = getConfig('DEFAULT_LANG');
 
 // Generate filename
 $INC = sprintf("inc/language/%s.php", SQL_ESCAPE($mx_lang));
 
-// Generate FQFN
-$FQFN = constant('PATH') . $INC;
-
 // Look for file
-if (!FILE_READABLE($FQFN)) {
+if (!isIncludeReadable($INC)) {
        // Switch to default (DO NOT CHANGE!!!)
-       $mx_lang = constant('DEFAULT_LANG');
-       set_session('mx_lang', $mx_lang);
-       $INC = sprintf("inc/language/%s.php", $mx_lang);
+       setLanguage('de');
+       $INC = 'inc/language/de.php';
+
+       // And set it temporarily
+       setConfigEntry('DEFAULT_LANG', 'de');
 } // END - if
 
 // Load language file
-LOAD_INC_ONCE($INC);
+loadIncludeOnce($INC);
 
 // Check for installation mode
 if ((isInstalling()) || (!isInstalled()) || (!isAdminRegistered())) {
        // Load matching language file
-       LOAD_INC('inc/language/install_' . $mx_lang . '.php');
+       loadInclude('inc/language/install_' . getSession('mx_lang') . '.php');
 }
 
 // Remove no more needed variables