From 953b279cc024645c705c8d685f0ae28b134f5b52 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 15 Jul 2024 15:49:34 +0200
Subject: [PATCH] wip #7005 @0.25

---
 app/Fluidbook/Compiler/Compiler.php | 6 +++++-
 app/Fluidbook/Farm.php              | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Fluidbook/Compiler/Compiler.php b/app/Fluidbook/Compiler/Compiler.php
index b2155919e..345ea9761 100644
--- 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 13821ab83..25562d277 100644
--- 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) {
-- 
2.39.5