Peter M. Groen / knowledgetree

Commit e5585d579c538de09d4260678e3b363cd8ce1ad1

Authored by kevin_fourie
1 parent 3bca0ed2

Merged in from DEV trunk... 

KTS-3452
"KnowledgeTree throwing fatal error when unable to connect to MySQL"
Fixed. Now shows standard error page.

Committed By: Donald Jackson
Reviewed By: Kevin Fourie


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8912 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 14 additions and 4 deletions
config/dmsDefaults.php
  View file @e5585d5
... ... @@ -469,6 +469,8 @@ class KTInit {
469 469  
470 470 if(PEAR::isError($dbSetup))
471 471 {
  472 + /* We need to setup the language handler to display this error correctly */
  473 + $this->setupI18n();
472 474 $this->handleInitError($dbSetup);
473 475 }
474 476  
... ...
lib/util/ktutil.inc
  View file @e5585d5
... ... @@ -91,8 +91,12 @@ class KTUtil {
91 91 $cacheDir = $default->cacheDirectory;
92 92  
93 93 $base_url = @file_get_contents($cacheDir . '/' . KTUtil::SERVER_NAME_FILE);
94   -
95   - $default->log->debug("kt_url: base url - $base_url");
  94 +
  95 + /* We are checking if the object exists because we could have an error pre oor during initialization */
  96 + if(is_object($default->log))
  97 + {
  98 + $default->log->debug("kt_url: base url - $base_url");
  99 + }
96 100  
97 101 if (false !== $base_url)
98 102 {
... ... @@ -104,8 +108,12 @@ class KTUtil {
104 108 $rootUrl = $default->rootUrl;
105 109  
106 110 $base_url = ($default->sslEnabled ? 'https' : 'http') .'://'.$serverName . $rootUrl;
107   -
108   - $default->log->debug("kt_url: base url - $base_url");
  111 +
  112 + if(is_object($default->log))
  113 + {
  114 + $default->log->debug("kt_url: base url - $base_url");
  115 + }
  116 +
109 117  
110 118 return $base_url;
111 119  
... ...