From cb3195a90ac0dc0f022dd91702dbb3f0c1f1b4ad Mon Sep 17 00:00:00 2001
From: Xander Luedtke <xander@luedtke.ca>
Date: Mon, 9 Jan 2023 09:24:28 -0700
Subject: [PATCH] Moving docker $repo_branch var to config.php

---
 settings_update.php | 4 ++--
 setup.php           | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/settings_update.php b/settings_update.php
index 8fbb5d78..bbe27db0 100644
--- a/settings_update.php
+++ b/settings_update.php
@@ -1,12 +1,12 @@
 <?php
 include("inc_all_settings.php");
 include("database_version.php");
+include("config.php")
 ?>
 
 <?php
 
-//fetch the latest code changes but don't apply them\
-$repo_branch = 'master';
+//fetch the latest code changes but don't apply them
 exec("git fetch", $output, $result);
 $latest_version = exec("git rev-parse origin/$repo_branch");
 $current_version = exec("git rev-parse HEAD");
diff --git a/setup.php b/setup.php
index 9f392a84..0fa4da37 100644
--- a/setup.php
+++ b/setup.php
@@ -799,6 +799,7 @@ if(isset($_POST['add_database'])){
   $new_config[] = "\$config_app_name = 'ITFlow';\n";
   $new_config[] = sprintf("\$config_base_url = '%s';\n", addslashes($config_base_url));
   $new_config[] = "\$config_https_only = TRUE;\n";
+  $new_config[] = "\$repo_branch = 'master';\n";
 
   file_put_contents("config.php", $new_config);