Under Win32, we need backslashes in paths. Now it works!!

Merged from MOODLE_14_STABLE

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index eee5fbdef24a51ef7cf3b2a51b90d9e7ba2244b6..9816c70606b37dc7be8c6fb33e8f2ac01d9d63c1 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -4296,6 +4296,10 @@ function zip_files ($originalfiles, $destination) {
         $command = 'cd '.escapeshellarg($origpath).$separator.
                     escapeshellarg($CFG->zip).' -r '.
                     escapeshellarg(cleardoubleslashes("$destpath/$destfilename")).' '.$filestozip;
+        //All converted to backslashes in WIN
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+            $command = str_replace('/','\\',$command);
+        }
         Exec($command);
     }
     return true;
@@ -4364,6 +4368,10 @@ function unzip_file ($zipfile, $destination = '') {
                     escapeshellarg($CFG->unzip).' -o '.
                     escapeshellarg(cleardoubleslashes("$zippath/$zipfilename")).' -d '.
                     escapeshellarg($destpath).$redirection;
+        //All converted to backslashes in WIN
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+            $command = str_replace('/','\\',$command);
+        }
         Exec($command,$list);
     }