From 24ef7d15f6d464e570781cfff1bebe852260835a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 30 Oct 2009 09:40:56 +0000 Subject: [PATCH] Fix for _PRIME and typo --- inc/config-functions.php | 2 +- inc/functions.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/config-functions.php b/inc/config-functions.php index 4d873332c9..fd29373344 100644 --- 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 d5f4555921..b3b990a342 100644 --- 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++) { -- 2.39.5