diff --git a/core/basepage.php b/core/basepage.php index 98e48091..4f309956 100644 --- a/core/basepage.php +++ b/core/basepage.php @@ -267,7 +267,7 @@ class BasePage header("HTTP/1.0 {$this->code} Shimmie"); header("Content-type: " . $this->type); - header("X-Powered-By: SCore-" . SCORE_VERSION); + header("X-Powered-By: Shimmie-" . VERSION); if (!headers_sent()) { foreach ($this->http_headers as $head) { diff --git a/core/sys_config.php b/core/sys_config.php index dd649957..80d1cc59 100644 --- a/core/sys_config.php +++ b/core/sys_config.php @@ -35,9 +35,3 @@ _d("BASE_URL", null); // string force a specific base URL (default is a _d("TRACE_FILE", null); // string file to log performance data into _d("TRACE_THRESHOLD", 0.0); // float log pages which take more time than this many seconds _d("ENABLED_MODS", "imageboard"); - -/* - * Calculated settings - you should never need to change these - * directly, only the things they're built from - */ -_d("SCORE_VERSION", 'develop/'.VERSION); // string SCore version diff --git a/core/util.php b/core/util.php index b548336a..8ed06f0c 100644 --- a/core/util.php +++ b/core/util.php @@ -457,7 +457,7 @@ function get_debug_info(): string $debug .= "; Used $i_files files and {$database->query_count} queries"; $debug .= "; Sent $_shm_event_count events"; $debug .= "; $hits cache hits and $miss misses"; - $debug .= "; Shimmie version ". VERSION . $commit; // .", SCore Version ". SCORE_VERSION; + $debug .= "; Shimmie version ". VERSION . $commit; return $debug; } @@ -496,8 +496,8 @@ function _sanitise_environment(): void $min_php = "7.3"; if (version_compare(phpversion(), $min_php, ">=") === false) { print " -Shimmie (SCore Engine) does not support versions of PHP lower than $min_php -(PHP reports that it is version ".phpversion().") +Shimmie does not support versions of PHP lower than $min_php +(PHP reports that it is version ".phpversion()."). If your web host is running an older version, they are dangerously out of date and you should plan on moving elsewhere. "; diff --git a/tests/defines.php b/tests/defines.php index 69f97753..4ee04c1f 100644 --- a/tests/defines.php +++ b/tests/defines.php @@ -17,7 +17,6 @@ define("BASE_URL", null); define("TRACE_FILE", null); define("TRACE_THRESHOLD", 0.0); define("ENABLED_MODS", "imageboard"); -define("SCORE_VERSION", 'develop/'.VERSION); define("TIMEZONE", 'UTC'); define("BASE_HREF", "/"); define("CLI_LOG_LEVEL", 50);