From 6d36e1cb166cd3cd44e6ce0993329639b327007b Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Wed, 9 Dec 2015 20:19:52 +0100 Subject: [PATCH] Do not use the DIRECTORY_SEPARATOR constant for URLs The constant DIRECTORY_SEPARATOR is "\" on windows and therefore the favicon urls are invalid for php on windows. Renamed the FAVICON_PUBLIC_DIRECTORY constant to a more descriptive name. --- common.php | 2 +- config.default.php | 4 ++-- docs/config.markdown | 4 ++-- lib/helpers.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common.php b/common.php index 6adca5c..05c89bb 100644 --- a/common.php +++ b/common.php @@ -16,7 +16,7 @@ defined('ROOT_DIRECTORY') or define('ROOT_DIRECTORY', __DIR__); defined('DATA_DIRECTORY') or define('DATA_DIRECTORY', ROOT_DIRECTORY.DIRECTORY_SEPARATOR.'data'); defined('FAVICON_DIRECTORY') or define('FAVICON_DIRECTORY', DATA_DIRECTORY.DIRECTORY_SEPARATOR.'favicons'); -defined('FAVICON_PUBLIC_DIRECTORY') or define('FAVICON_PUBLIC_DIRECTORY', 'data'.DIRECTORY_SEPARATOR.'favicons'); +defined('FAVICON_URL_PATH') or define('FAVICON_URL_PATH', 'data/favicons'); defined('ENABLE_MULTIPLE_DB') or define('ENABLE_MULTIPLE_DB', true); defined('DB_FILENAME') or define('DB_FILENAME', 'db.sqlite'); diff --git a/config.default.php b/config.default.php index fb5cf8b..772a2a7 100644 --- a/config.default.php +++ b/config.default.php @@ -12,8 +12,8 @@ define('DATA_DIRECTORY', __DIR__.'/data'); // FAVICON_DIRECTORY => default is favicons (writable directory) define('FAVICON_DIRECTORY', DATA_DIRECTORY.DIRECTORY_SEPARATOR.'favicons'); -// FAVICON_PUBLIC_DIRECTORY => default is data/favicons/ -define('FAVICON_PUBLIC_DIRECTORY', 'data'.DIRECTORY_SEPARATOR.'favicons'); +// FAVICON_URL_PATH => default is data/favicons/ +define('FAVICON_URL_PATH', 'data/favicons'); // DB_FILENAME => default value is db.sqlite (default database filename) define('DB_FILENAME', 'db.sqlite'); diff --git a/docs/config.markdown b/docs/config.markdown index 1ff8137..986c7b6 100644 --- a/docs/config.markdown +++ b/docs/config.markdown @@ -26,8 +26,8 @@ define('DATA_DIRECTORY', __DIR__.'/data'); // FAVICON_DIRECTORY => default is favicons (writable directory) define('FAVICON_DIRECTORY', DATA_DIRECTORY.DIRECTORY_SEPARATOR.'favicons'); -// FAVICON_PUBLIC_DIRECTORY => default is data/favicons/ -define('FAVICON_PUBLIC_DIRECTORY', 'data'.DIRECTORY_SEPARATOR.'favicons'); +// FAVICON_URL_PATH => default is data/favicons/ +define('FAVICON_URL_PATH', 'data/favicons'); // DB_FILENAME => default value is db.sqlite (default database filename) define('DB_FILENAME', 'db.sqlite'); diff --git a/lib/helpers.php b/lib/helpers.php index b6c3786..68ad4b9 100644 --- a/lib/helpers.php +++ b/lib/helpers.php @@ -52,7 +52,7 @@ function favicon_extension($type) function favicon(array $favicons, $feed_id) { if (! empty($favicons[$feed_id])) { - return ''; + return ''; } return '';