From 0fc6683288d4b5155a8e71ec4eaf37ac5af8739c Mon Sep 17 00:00:00 2001 From: kevin_fourie Date: Tue, 12 Aug 2008 14:19:12 +0000 Subject: [PATCH] Merged in from STABLE trunk... --- lib/upgrades/UpgradeFunctions.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/upgrades/UpgradeFunctions.inc.php b/lib/upgrades/UpgradeFunctions.inc.php index 602049a..1204b10 100644 --- a/lib/upgrades/UpgradeFunctions.inc.php +++ b/lib/upgrades/UpgradeFunctions.inc.php @@ -1319,9 +1319,9 @@ class UpgradeFunctions { // Files MUST be removed before folders and folders MUST be empty $oldPath1 = KT_DIR . "/templates/ktstandard/searchdashlet/"; - $this->rm_recursive($oldPath1); + UpgradeFunctions::rm_recursive($oldPath1); $oldPath2 = KT_DIR . "/plugins/generalmetadata/"; - $this->rm_recursive($oldPath2); + UpgradeFunctions::rm_recursive($oldPath2); // FIXME: We should check that they all worked return true; @@ -1339,7 +1339,7 @@ class UpgradeFunctions { { continue; } - if (!rm_recursive($filepath.'/'.$sf)) + if (!UpgradeFunctions::rm_recursive($filepath.'/'.$sf)) { //throw new Exception( $filepath.'/'.$sf.' could not be deleted.'); return false; -- libgit2 0.21.4