From 97ba6261a8eb7f94963ecc91043e5a2d54ffd248 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 15 May 2021 21:33:43 +0200
Subject: git update auto change to edge branch (#3589)

* git update auto change to edge branch
For existing installations using automatic git update, checkout *edge* branch if it was still using *master* or *dev*.

* One more prune

* Fix several small issues

* theirs does not work here

* Use migration mechanism

* Better handling of Migration errors

* Test details

* Fix tests

* Do not use new migration system for now
---
 p/i/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'p/i')

diff --git a/p/i/index.php b/p/i/index.php
index 3591c4446..71b19a1ca 100755
--- a/p/i/index.php
+++ b/p/i/index.php
@@ -63,8 +63,8 @@ if (!file_exists($applied_migrations_path)) {
 	}
 
 	if ($error) {
-		Minz_Log::error($error);
-		errorMessage('Fatal error');
 		syslog(LOG_INFO, 'FreshRSS Fatal error! ' . $error);
+		Minz_Log::error($error);
+		die(errorMessage('Fatal error', $error));
 	}
 }
-- 
cgit v1.2.3