summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-03-22 09:38:19 +0400
committerAndrew Dolgov <[email protected]>2013-03-22 09:38:19 +0400
commit1f56ba13cd69efca4f24a3bce9a8bb8ebcf3ebac (patch)
treee9f8ea4d4ac39f60587e6d08774c176220199c83
parent707ad6ddf7b199e202fc39f61ffd08a4bc5bacc1 (diff)
remove default definition of SITE_TITLE; rename to _SITE_TITLE as with other constants of this nature
-rw-r--r--config.php-dist3
-rw-r--r--include/functions.php10
2 files changed, 5 insertions, 8 deletions
diff --git a/config.php-dist b/config.php-dist
index 176949fd9..a5a7fc3e2 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 0e2a922ba..7d4ce2918 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";
+ }
}
?>