From 2aff347b2e942286292b21e0b20d93ab85220a17 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 4 Jan 2020 23:35:42 +0100 Subject: Fix wrong getHeader refactoring (#2749) * Fix wrong getHeader refactoring Fix regression introduced by https://github.com/FreshRSS/FreshRSS/pull/2373 The refactoring required a call to init() even for static functions, which is most of the time not done. Removed premature abstraction of `$_SERVER`, which was the root cause of the bug. https://github.com/FreshRSS/FreshRSS/issues/2748#issuecomment-569898931 * Refactoring: Move serverIsPublic to Minz_Request * Add mitigations for wrong configurations Due to the regression, we have some existing configurations with a bad base_url * Forgot one instance --- cli/do-install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cli/do-install.php') diff --git a/cli/do-install.php b/cli/do-install.php index 16ac833ea..177e98c21 100755 --- a/cli/do-install.php +++ b/cli/do-install.php @@ -53,7 +53,7 @@ foreach ($params as $param) { } } -if ((!empty($config['base_url'])) && server_is_public($config['base_url'])) { +if ((!empty($config['base_url'])) && Minz_Request::serverIsPublic($config['base_url'])) { $config['pubsubhubbub_enabled'] = true; } -- cgit v1.2.3