james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Stop failing to have a separate SCORE_VERSION

Browse Source
This commit is contained in:
Shish 2020-01-27 19:57:07 +00:00
parent 15d1e4ef17
commit 59c89ee135
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/basepage.php
View File

@ -267,7 +267,7 @@ class BasePage
header("HTTP/1.0 {$this->code} Shimmie"); header("HTTP/1.0 {$this->code} Shimmie");
header("Content-type: " . $this->type); header("Content-type: " . $this->type);
header("X-Powered-By: SCore-" . SCORE_VERSION); header("X-Powered-By: Shimmie-" . VERSION);
if (!headers_sent()) { if (!headers_sent()) {
foreach ($this->http_headers as $head) { foreach ($this->http_headers as $head) {

6
core/sys_config.php
View File

@ -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_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("TRACE_THRESHOLD", 0.0); // float log pages which take more time than this many seconds
_d("ENABLED_MODS", "imageboard"); _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

6
core/util.php
View File

@ -457,7 +457,7 @@ function get_debug_info(): string
$debug .= "; Used $i_files files and {$database->query_count} queries"; $debug .= "; Used $i_files files and {$database->query_count} queries";
$debug .= "; Sent $_shm_event_count events"; $debug .= "; Sent $_shm_event_count events";
$debug .= "; $hits cache hits and $miss misses"; $debug .= "; $hits cache hits and $miss misses";
$debug .= "; Shimmie version ". VERSION . $commit; // .", SCore Version ". SCORE_VERSION; $debug .= "; Shimmie version ". VERSION . $commit;
return $debug; return $debug;
} }
@ -496,8 +496,8 @@ function _sanitise_environment(): void
$min_php = "7.3"; $min_php = "7.3";
if (version_compare(phpversion(), $min_php, ">=") === false) { if (version_compare(phpversion(), $min_php, ">=") === false) {
print " print "
Shimmie (SCore Engine) does not support versions of PHP lower than $min_php Shimmie does not support versions of PHP lower than $min_php
(PHP reports that it is version ".phpversion().") (PHP reports that it is version ".phpversion().").
If your web host is running an older version, they are dangerously out of If your web host is running an older version, they are dangerously out of
date and you should plan on moving elsewhere. date and you should plan on moving elsewhere.
"; ";

1
tests/defines.php
View File

@ -17,7 +17,6 @@ define("BASE_URL", null);
define("TRACE_FILE", null); define("TRACE_FILE", null);
define("TRACE_THRESHOLD", 0.0); define("TRACE_THRESHOLD", 0.0);
define("ENABLED_MODS", "imageboard"); define("ENABLED_MODS", "imageboard");
define("SCORE_VERSION", 'develop/'.VERSION);
define("TIMEZONE", 'UTC'); define("TIMEZONE", 'UTC');
define("BASE_HREF", "/"); define("BASE_HREF", "/");
define("CLI_LOG_LEVEL", 50); define("CLI_LOG_LEVEL", 50);