wip #7005 @0.25

diff --git a/app/Fluidbook/Compiler/Compiler.php b/app/Fluidbook/Compiler/Compiler.php
index b2155919ed5cb927334f9b2ee2e925e5da813d6c..345ea97619fd1e29bee50cab1d5f02231ef8df12 100644 (file)
--- a/app/Fluidbook/Compiler/Compiler.php
+++ b/app/Fluidbook/Compiler/Compiler.php
@@ -305,7 +305,8 @@ class Compiler extends Base implements CompilerInterface, IVirtualDirectoryError
         $this->phonegapVersion = self::getPhonegapVersion($phonegapVersion);
         $this->appcache = $appcache;
         $this->multiApp = $this->home = $home;
-        $this->devversion = /*$this->getFluidbook()->version < 3 ? "dev" : */$this->getFluidbook()->mobileLVersion;
+        $this->devversion = /*$this->getFluidbook()->version < 3 ? "dev" : */
+            $this->getFluidbook()->mobileLVersion;
         $this->scormVariant = $scormVariant;
 
         $this->hybrid = $hybrid;
@@ -2479,6 +2480,9 @@ class Compiler extends Base implements CompilerInterface, IVirtualDirectoryError
         if (null !== $dir) {
             $res .= $dir . '/';
         }
+        if (!$version) {
+            $version = 'stable';
+        }
         if ($version === 'stable') {
             $res .= 'branches/master';
         } else if ($version === 'dev') {

diff --git a/app/Fluidbook/Farm.php b/app/Fluidbook/Farm.php
index 13821ab836fd48c2cc48f08ae07d3a6144019fdb..25562d2773d0bd3c101373044edf33caf70e709f 100644 (file)
--- a/app/Fluidbook/Farm.php
+++ b/app/Fluidbook/Farm.php
@@ -298,7 +298,7 @@ class Farm
         $params['toolbox'] = '1';
 
         try {
-            $output = self::sendRequest($farmer, 'process.php', $params);
+            $output = self::sendRequest($farmer, 'process.php', $params, 3600);
         } catch (\Exception $e) {
             Log::error('Farm server error ' . $farmer['name'] . ' : ' . json_encode($params) . ' : ' . $e->getMessage());
             if ($attempts > 0) {