From b26d09d62b5144c3dfe3f1d7ec17a1c48d4d9bab Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Wed, 30 Jan 2019 07:09:47 +0100
Subject: [PATCH 1/2] warn in admin panel when legacy config is used

---
 mod/admin.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mod/admin.php b/mod/admin.php
index 684c31af1..5b252f6bf 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -936,6 +936,10 @@ function admin_page_summary(App $a)
 		$showwarning = true;
 		$warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from <code>.htconfig.php</code>. See <a href="%s">the Config help page</a> for help with the transition.', $a->getBaseURL() . '/help/Config');
 	}
+	if (file_exists('local.ini.php')) {
+		$showwarning = true;
+		$warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from <code>config/local.ini.php</code>. See <a href="%s">the Config help page</a> for help with the transition.', $a->getBaseURL() . '/help/Config');
+	}
 
 	// Check server vitality
 	if (!admin_page_server_vital()) {

From cb72a5fd3bb693d4de002169c7d7daad7f8d7840 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Wed, 30 Jan 2019 10:40:28 +0100
Subject: [PATCH 2/2] look in the config directory for the file

---
 mod/admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/admin.php b/mod/admin.php
index 5b252f6bf..7723a5155 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -936,7 +936,7 @@ function admin_page_summary(App $a)
 		$showwarning = true;
 		$warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from <code>.htconfig.php</code>. See <a href="%s">the Config help page</a> for help with the transition.', $a->getBaseURL() . '/help/Config');
 	}
-	if (file_exists('local.ini.php')) {
+	if (file_exists('config/local.ini.php')) {
 		$showwarning = true;
 		$warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from <code>config/local.ini.php</code>. See <a href="%s">the Config help page</a> for help with the transition.', $a->getBaseURL() . '/help/Config');
 	}