Peter M. Groen / knowledgetree

Commit b66ca71b62c963b6c1494b34d4e0519734b02539

Authored by kevin_fourie
1 parent f3f7c1ea

KTS-2799 

"3.5.2 beta 2 upgrade error"
Updated. Fixed plugin_helper clean sql. Fixed root path in config.ini. 

Committed By: Kevin Fourie
Reviewed By: Jonathan Byrne

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7966 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 3 changed files with 6 additions and 5 deletions
lib/upgrades/Ini.inc.php
  View file @b66ca71
... ... @@ -187,7 +187,7 @@ class Ini {
187 187  
188 188 if(!$this->itemExists($delSection, $delItem)) return false;
189 189  
190   - unset(this->cleanArray[$delSection][$delItem]);
  190 + unset($this->cleanArray[$delSection][$delItem]);
191 191 return true;
192 192 }
193 193  
... ...
lib/upgrades/UpgradeFunctions.inc.php
  View file @b66ca71
... ... @@ -967,7 +967,8 @@ class UpgradeFunctions {
967 967 // {{{ updateConfigFile35
968 968 function updateConfigFile35()
969 969 {
970   - $configPath = KTConfig::getConfigFilename();
  970 + $config = KTConfig::getSingleton();
  971 + $configPath = KTConfig::getConfigFilename();
971 972 $configPath = str_replace(array("\n","\r"), array('',''), $configPath);
972 973  
973 974 if(file_exists($configPath)) {
... ... @@ -1074,9 +1075,9 @@ class UpgradeFunctions {
1074 1075 $ini->addItem('CustomErrorMessages', 'customerrorhandler', 'on', 'Turn custom error handler on or off');
1075 1076  
1076 1077 // URLS Section
1077   - $ini->addItem('urls', 'varDirectory', '${fileSystemRoot}/var', 'directories');
  1078 + $ini->addItem('urls', 'varDirectory', $config->get("urls/varDirectory"), 'directories');
1078 1079 $ini->addItem('urls', 'logDirectory', '${varDirectory}/log');
1079   - $ini->addItem('urls', 'documentRoot', '${fileSystemRoot}/Documents');
  1080 + $ini->addItem('urls', 'documentRoot', $config->get("urls/documentRoot"));
1080 1081 $ini->addItem('urls', 'uiDirectory', '${fileSystemRoot}/presentation/lookAndFeel/knowledgeTree');
1081 1082 $ini->addItem('urls', 'tmpDirectory', '${varDirectory}/tmp');
1082 1083 $ini->addItem('urls', 'graphicsUrl', '${rootUrl}/graphics', 'urls');
... ...
sql/mysql/upgrade/3.5.2/clean_plugin_helper.sql
  View file @b66ca71
1   -DELETE * FROM plugin_helper;
  1 +DELETE FROM plugin_helper;
... ...