Peter M. Groen / knowledgetree

Commit 0fc6683288d4b5155a8e71ec4eaf37ac5af8739c

Authored by kevin_fourie
1 parent 17ced67b

Merged in from STABLE trunk... 

KTS-3596
"Remove old search plugins when upgrading from 3.4.6 to 3.5.3"
Fixed. Corrected rmdir() non-recursive issue.

Committed by: Kevin Fourie
Reviewed by: Megan Watson


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.3-Release-Branch@9124 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
lib/upgrades/UpgradeFunctions.inc.php
  View file @0fc6683
@@ -1319,9 +1319,9 @@ class UpgradeFunctions { @@ -1319,9 +1319,9 @@ class UpgradeFunctions {
1319 1319
1320 // Files MUST be removed before folders and folders MUST be empty 1320 // Files MUST be removed before folders and folders MUST be empty
1321 $oldPath1 = KT_DIR . "/templates/ktstandard/searchdashlet/"; 1321 $oldPath1 = KT_DIR . "/templates/ktstandard/searchdashlet/";
1322 - $this->rm_recursive($oldPath1); 1322 + UpgradeFunctions::rm_recursive($oldPath1);
1323 $oldPath2 = KT_DIR . "/plugins/generalmetadata/"; 1323 $oldPath2 = KT_DIR . "/plugins/generalmetadata/";
1324 - $this->rm_recursive($oldPath2); 1324 + UpgradeFunctions::rm_recursive($oldPath2);
1325 1325
1326 // FIXME: We should check that they all worked 1326 // FIXME: We should check that they all worked
1327 return true; 1327 return true;
@@ -1339,7 +1339,7 @@ class UpgradeFunctions { @@ -1339,7 +1339,7 @@ class UpgradeFunctions {
1339 { 1339 {
1340 continue; 1340 continue;
1341 } 1341 }
1342 - if (!rm_recursive($filepath.'/'.$sf)) 1342 + if (!UpgradeFunctions::rm_recursive($filepath.'/'.$sf))
1343 { 1343 {
1344 //throw new Exception( $filepath.'/'.$sf.' could not be deleted.'); 1344 //throw new Exception( $filepath.'/'.$sf.' could not be deleted.');
1345 return false; 1345 return false;