From 1f56ba13cd69efca4f24a3bce9a8bb8ebcf3ebac Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 22 Mar 2013 09:38:19 +0400 Subject: [PATCH] remove default definition of SITE_TITLE; rename to _SITE_TITLE as with other constants of this nature --- config.php-dist | 3 --- include/functions.php | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/config.php-dist b/config.php-dist index 176949fd..a5a7fc3e 100644 --- a/config.php-dist +++ b/config.php-dist @@ -183,9 +183,6 @@ // Users may enable other user plugins from Preferences/Plugins but may not // disable plugins specified in this list. - define('SITE_TITLE', 'Tiny Tiny RSS'); - // Change this value to customize the HTML page title - define('CONFIG_VERSION', 26); // Expected config version. Please update this option in config.php // if necessary (after migrating all new options from this file). diff --git a/include/functions.php b/include/functions.php index 0e2a922b..7d4ce291 100644 --- a/include/functions.php +++ b/include/functions.php @@ -4099,10 +4099,10 @@ } function get_site_title() { - $original_title = "Tiny Tiny RSS"; - if (defined("SITE_TITLE")) { - return SITE_TITLE; - } - return $original_title; + if (defined("_SITE_TITLE")) { + return _SITE_TITLE; + } else { + return "Tiny Tiny RSS"; + } } ?>