Peter M. Groen / knowledgetree

Commit ee2ca5bc57c7e3ca60b1dd4f75b382cde78c1a0e

Authored by kevin_fourie
1 parent 9a6425bb

Merged in from DEV trunk... 

KTS-3129
"After upgrade user can conenct KTE to Server but cannot upload files or create folders"
Fixed. 

Committed by: Megan Watson
Reviewed by: Conrad Vermeulen


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8227 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 5 additions and 2 deletions
lib/upgrades/UpgradeFunctions.inc.php
  View file @ee2ca5b
... ... @@ -165,7 +165,7 @@ class UpgradeFunctions {
165 165 if (empty($parent_ids)) $parent_ids = null;
166 166 if (empty($full_path)) $full_path = null;
167 167  
168   - $full_path = (empty($full_path))?$name:($full_path . '/' . $name);
  168 + if($folderid != 1) $full_path = (empty($full_path))?$name:($full_path . '/' . $name);
169 169 $folder_ids [] = $folderid;
170 170  
171 171 $sql = "update folders set name=?,description=?, full_path=?, parent_folder_ids=? where id=?";
... ... @@ -189,7 +189,10 @@ class UpgradeFunctions {
189 189 {
190 190 $GLOBALS["_OBJECTCACHE"] = array();
191 191  
192   - UpgradeFunctions::_removeSlashesFromFolders(1, '', array(), array());
  192 + $sql = "select name from folders where id=1";
  193 + $name = DBUtil::getOneResultKey($sql,'name');
  194 +
  195 + UpgradeFunctions::_removeSlashesFromFolders(1, $name, array(), array());
193 196 DBUtil::commit();
194 197 }
195 198  
... ...