Several rewrites/renames, fixes for installation. Resolves #104

[mailer.git] / inc / language.php

diff --git a/inc/language.php b/inc/language.php
index 0c10b177870c703e1ab13df1333e1a61f5f9ba5e..0b931cb4163a6054de115c3c3c8a5f064a8d8ca5 100644 (file)
--- a/inc/language.php
+++ b/inc/language.php
@@ -58,10 +58,10 @@ if (!FILE_READABLE($FQFN)) {
 } // END - if
 
 // Load language file
-LOAD_INC($INC);
+LOAD_INC_ONCE($INC);
 
 // Check for installation mode
-if (isInstalling()) {
+if ((isInstalling()) || (!isInstalled()) || (!isAdminRegistered())) {
        // Load matching language file
        LOAD_INC("inc/language/install_".$mx_lang.".php");
 }