remove default definition of SITE_TITLE; rename to _SITE_TITLE as with other constant...

diff --git a/config.php-dist b/config.php-dist
index 176949fd984fb5d21f0a9f72e19b1a59d72e36a3..a5a7fc3e2dd727a1ec6c66828a7b0fcf3b6ba662 100644 (file)
--- 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 0e2a922ba1239870bcbbe38cccdef5ad7f58979b..7d4ce29186dcf49db359938986ec564d73da3a6e 100644 (file)
--- 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";
+                 }
     }
 ?>