From c1353b6384ea44258c14f79cdaa8ea6e38a8ae51 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 23 Mar 2013 09:45:21 +0400 Subject: [PATCH] Revert "remove default definition of SITE_TITLE; rename to _SITE_TITLE as with other constants of this nature" This reverts commit 1f56ba13cd69efca4f24a3bce9a8bb8ebcf3ebac. --- config.php-dist | 3 +++ include/functions.php | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/config.php-dist b/config.php-dist index 192cb15f9..c66fb39fa 100644 --- a/config.php-dist +++ b/config.php-dist @@ -186,6 +186,9 @@ // 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 994b4c179..00dc6a8fe 100644 --- a/include/functions.php +++ b/include/functions.php @@ -4086,10 +4086,10 @@ } function get_site_title() { - if (defined("_SITE_TITLE")) { - return _SITE_TITLE; - } else { - return "Tiny Tiny RSS"; - } + $original_title = "Tiny Tiny RSS"; + if (defined("SITE_TITLE")) { + return SITE_TITLE; + } + return $original_title; } ?>