From 6c4818c7dd25b5f85db4de0c81b29329852c956d Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 10 Oct 2018 15:21:05 +0000
Subject: [PATCH] #2291 @1.5

---
 inc/ws/Controlleur/class.ws.maintenance.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index ddb739c72..7518a1ca4 100644
--- 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];
-- 
2.39.5