dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade: Better handle Git response.

Browse Source
This commit is contained in:
reliberate
2015-07-02 21:25:45 -06:00
parent 73f2c21674
commit 39ff3bee5a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/upgrade/index.php
+2 -2
View File
@@ -58,7 +58,7 @@ if (sizeof($_POST) > 0) {
if (sizeof($response_source_update) > 0) { if (sizeof($response_source_update) > 0) {
$_SESSION["response_source_update"] = $response_source_update; $_SESSION["response_source_update"] = $response_source_update;
foreach ($response_source_update as $response_line) { foreach ($response_source_update as $response_line) {
if (substr_count($response_line, "Updated to revision") > 0 || substr_count($response_line, "At revision") > 0) { if (substr_count($response_line, "Updating ") > 0 || substr_count($response_line, "Already up-to-date.") > 0) {
$update_failed = false; $update_failed = false;
} }
} }
@@ -78,7 +78,7 @@ if (sizeof($_POST) > 0) {
substr_count($file_path_source, '/..') == 0 && substr_count($file_path_source, '/..') == 0 &&
substr_count($file_path_source, '/.') == 0 && substr_count($file_path_source, '/.') == 0 &&
substr_count($file_path_source, '/.svn') == 0 && substr_count($file_path_source, '/.svn') == 0 &&
substr_count($file_path_source, '/.git') == 0 && substr_count($file_path_source, '/.git') == 0
) { ) {
$file_path_target = str_replace($scripts_dir_source, $scripts_dir_target, $file_path_source); $file_path_target = str_replace($scripts_dir_source, $scripts_dir_target, $file_path_source);
if ($file_path_target != $scripts_dir_target.'/resources/config.lua') { if ($file_path_target != $scripts_dir_target.'/resources/config.lua') {