From 2850e56f30aeaf0e49065129bb0b6018f1d1945e Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 22 Jun 2019 22:04:49 +0100 Subject: [PATCH] [CORE] Add custom favicon configuration support Adds support for custom favicons defined in config.php that override theme favicons. --- DOCUMENTATION/SYSTEM_ADMINISTRATORS/CONFIGURE.md | 1 + lib/action.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/DOCUMENTATION/SYSTEM_ADMINISTRATORS/CONFIGURE.md b/DOCUMENTATION/SYSTEM_ADMINISTRATORS/CONFIGURE.md index a0682b98dd..b918ad04cd 100644 --- a/DOCUMENTATION/SYSTEM_ADMINISTRATORS/CONFIGURE.md +++ b/DOCUMENTATION/SYSTEM_ADMINISTRATORS/CONFIGURE.md @@ -146,6 +146,7 @@ This section is a catch-all for site-wide variables. be fine-tuned for notices, messages, profile bios and group descriptions. Zero indicates no limit. +* favicon: the path to a custom favicon, eg: favicon.png db ------------------------------------------------------------------------------- diff --git a/lib/action.php b/lib/action.php index 9cde0d7637..1f50351d3a 100644 --- a/lib/action.php +++ b/lib/action.php @@ -249,7 +249,7 @@ class Action extends HTMLOutputter // lawsuit if ($this->needLogin) { $this->checkLogin(); // if not logged in, this redirs/excepts } - + if ($this->redirectAfterLogin) { common_set_returnto($this->selfUrl()); } -- 2.39.5