AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-03-04 21:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #556 from lued/docker

Browse Source 
Moving docker $repo_branch var to config.php
This commit is contained in:
Johnny
2023-01-13 21:46:32 -05:00
committed by GitHub
parent 3baea5e757 a2765ae480
commit 335f3cc7d1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
settings_update.php
View File

@@ -1,12 +1,12 @@
<?php <?php
include("inc_all_settings.php"); include("inc_all_settings.php");
include("database_version.php"); include("database_version.php");
include("config.php")
?> ?>
<?php <?php
//fetch the latest code changes but don't apply them\ //fetch the latest code changes but don't apply them
$repo_branch = 'master';
exec("git fetch", $output, $result); exec("git fetch", $output, $result);
$latest_version = exec("git rev-parse origin/$repo_branch"); $latest_version = exec("git rev-parse origin/$repo_branch");
$current_version = exec("git rev-parse HEAD"); $current_version = exec("git rev-parse HEAD");

1
setup.php
View File

@@ -799,6 +799,7 @@ if(isset($_POST['add_database'])){
$new_config[] = "\$config_app_name = 'ITFlow';\n"; $new_config[] = "\$config_app_name = 'ITFlow';\n";
$new_config[] = sprintf("\$config_base_url = '%s';\n", addslashes($config_base_url)); $new_config[] = sprintf("\$config_base_url = '%s';\n", addslashes($config_base_url));
$new_config[] = "\$config_https_only = TRUE;\n"; $new_config[] = "\$config_https_only = TRUE;\n";
$new_config[] = "\$repo_branch = 'master';\n";
file_put_contents("config.php", $new_config); file_put_contents("config.php", $new_config);