#2291 @1.5

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index ddb739c72a79145f4dfa73a0a07520691cc0a1ac..7518a1ca437ddd6bffb278e0b7a77ecaf409d720 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -988,8 +988,12 @@ class wsMaintenance
                $playerDir = WS_COMPILE_ASSETS . '/player/';
                $branchesDir = $playerDir . 'branches/';
                $localDir = $playerDir . 'local/';
-               $git = new CubeIT_CommandLine_Git($branchesDir . 'fluidbook-html5');
                echo '<pre>';
+               $git = new CubeIT_CommandLine_Git($branchesDir . 'fluidbook-html5');
+               echo $git->executeCmd('stash save --keep-index');
+               $git = new CubeIT_CommandLine_Git($branchesDir . 'fluidbook-html5');
+               echo $git->executeCmd('stash drop');
+               $git = new CubeIT_CommandLine_Git($branchesDir . 'fluidbook-html5');
                echo $git->executeCmd('pull --all');
                $git = new CubeIT_CommandLine_Git($branchesDir . 'fluidbook-html5');
                echo $git->executeCmd('fetch --all --prune');
@@ -1042,7 +1046,7 @@ class wsMaintenance
                foreach ($dirs as $dir) {
                        cubeFiles::scanRecursiveDir($dir, $files);
                        $limit = TIME - 7200;
-                       if(is_array($files)) {
+                       if (is_array($files)) {
                                foreach ($files as $f) {
                                        if (filemtime($f) < $limit) {
                                                unlink($f);
@@ -1066,7 +1070,6 @@ class wsMaintenance
 
        public static function reencodeVideos($args)
        {
-
                cubePHP::neverStop();
 
                $book_id = $args[0];