Peter M. Groen / knowledgetree

Commit 232c6dfd10b25439a0f2c8f68c038123932f979c

Authored by kevin_fourie
1 parent 995eb5e5

Merged in from DEV trunk... 

KTS-3326
"Bug when loading cached config results in an error with array_key_exists."
Fixed.

Committed By: Conrad Vermeulen
Reviewed By: Philip Arkoll

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.2c-Release-Branch@8420 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 11 additions and 3 deletions
config/dmsDefaults.php
  View file @232c6df
@@ -469,10 +469,18 @@ function catchFatalErrors($p_OnOff='On'){ @@ -469,10 +469,18 @@ function catchFatalErrors($p_OnOff='On'){
469 $oKTConfig =& KTConfig::getSingleton(); 469 $oKTConfig =& KTConfig::getSingleton();
470 $oKTConfig->loadCache($cache_file); 470 $oKTConfig->loadCache($cache_file);
471 471
472 - foreach ($oKTConfig->flat as $k => $v) {  
473 - $default->$k = $oKTConfig->get($k); 472 + // checking flatns as it should be more complete
  473 + if (empty($oKTConfig->flatns)) {
  474 + $use_cache = false;
474 } 475 }
475 - } else { 476 + else {
  477 + foreach ($oKTConfig->flat as $k => $v) {
  478 + $default->$k = $oKTConfig->get($k);
  479 + }
  480 + }
  481 + }
  482 +
  483 + if (!$use_cache) {
476 $oKTConfig =& KTConfig::getSingleton(); 484 $oKTConfig =& KTConfig::getSingleton();
477 485
478 $oKTConfig->setdefaultns('ui', 'appName', 'KnowledgeTree'); 486 $oKTConfig->setdefaultns('ui', 'appName', 'KnowledgeTree');