[CORE] Add custom favicon configuration support

Adds support for custom favicons defined in config.php that override theme favicons.

diff --git a/DOCUMENTATION/SYSTEM_ADMINISTRATORS/CONFIGURE.md b/DOCUMENTATION/SYSTEM_ADMINISTRATORS/CONFIGURE.md
index a0682b98dddbbe5ee5a286898d3f3a8540c21099..b918ad04cde1589ad85395bde750f00d9411b09b 100644 (file)
--- 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 9cde0d7637d021799a7d5f257fc6b227cdd21b26..1f50351d3a2aa53d66f36aa84d9993f6041823ff 100644 (file)
--- 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());
         }