http://www.atutor.ca/atutor/mantis/view.php?id=4474
authorCindy Li <cli@ocad.ca>
Mon, 9 Aug 2010 18:29:34 +0000 (18:29 -0000)
committerCindy Li <cli@ocad.ca>
Mon, 9 Aug 2010 18:29:34 +0000 (18:29 -0000)
docs/updater/classes/Patch.class.php
docs/updater/index.php

index e131bfd..fa52c6e 100644 (file)
@@ -452,7 +452,7 @@ class Patch {
 
                if (!$this->svn_server_connected) return true;
                
-               $svn_file = SVN_TAG_FOLDER . 'transformable_' . str_replace('.', '_', VERSION) .
+               $svn_file = SVN_TAG_FOLDER . 'acontent_' . str_replace('.', '_', VERSION) .
                            str_replace(substr($this->relative_to_root, 0, -1), '' , $folder) .$file;
                $local_file = $folder.$file;
 
index a914a05..fe03417 100644 (file)
@@ -14,7 +14,7 @@ define('TR_INCLUDE_PATH', '../include/');
 \r
 require (TR_INCLUDE_PATH.'vitals.inc.php');\r
 require_once('classes/PatchListParser.class.php');\r
-require_once(TR_INCLUDE_PATH. 'classes/Utility.class.php');\r
+require_once(TR_INCLUDE_PATH. 'classes/FileUtility.class.php');\r
 require_once(TR_INCLUDE_PATH. 'classes/DAO/PatchesDAO.class.php');\r
 require_once('include/common.inc.php');\r
 \r
@@ -116,14 +116,14 @@ if ($_POST['install_upload'] && $_POST['uploading'])
        include_once(TR_INCLUDE_PATH . 'lib/pclzip.lib.php');\r
        \r
        // clean up module content folder\r
-       Utility::clearDir($module_content_folder);\r
+       FileUtility::clr_dir($module_content_folder);\r
        \r
        // 1. unzip uploaded file to module's content directory\r
        $archive = new PclZip($_FILES['patchfile']['tmp_name']);\r
 \r
        if ($archive->extract(PCLZIP_OPT_PATH, $module_content_folder) == 0)\r
        {\r
-           Utility::clearDir($module_content_folder);\r
+           FileUtility::clr_dir($module_content_folder);\r
            $msg->addError('CANNOT_UNZIP');\r
        }\r
 }\r