Fix for _PRIME and typo

diff --git a/inc/config-functions.php b/inc/config-functions.php
index 4d873332c9101293ec4f77447df3581c4d396105..fd29373344d66379df08aeea07eb6577c39f2ecd 100644 (file)
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -127,7 +127,7 @@ function getConfigArray () {
        $return = array();
 
        // Is the config set?
-       if (isset($GLOABLS['config'])) {
+       if (isset($GLOBALS['config'])) {
                // Then use it
                $return = $GLOBALS['config'];
        } // END - if

diff --git a/inc/functions.php b/inc/functions.php
index d5f455592107ffc037656fec0abf166309df75fd..b3b990a3426f61c303d582a69f97807eacd61f76 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2168,7 +2168,7 @@ function generatePassString ($passHash) {
        $ret = $passHash;
 
        // Is a secret key and master salt already initialized?
-       if ((isExtensionInstalled('sql_patches')) && (isConfigEntrySet('secret_key')) && (isConfigEntrySet('master_salt'))) {
+       if ((isExtensionInstalled('sql_patches')) && (isConfigEntrySet('_PRIME')) && (isConfigEntrySet('secret_key')) && (isConfigEntrySet('master_salt'))) {
                // Only calculate when the secret key is generated
                $newHash = ''; $start = 9;
                for ($idx = 0; $idx < 10; $idx++) {