shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4749 from Citadel-Station-13/upstream-merge-34223

Browse Source 
[MIRROR] Stops the dbadmin warning if SQL_ENABLED isnt set
This commit is contained in:
LetterJay
2018-01-11 15:14:32 -06:00
committed by GitHub
parent 92e8f3cefc 534c8e9d8f
commit 25d231fc20
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_ranks.dm
+4 -2
View File
@@ -143,8 +143,10 @@ GLOBAL_PROTECT(admin_ranks)
previous_rights = R.rights
else
if(!SSdbcore.Connect())
log_world("Failed to connect to database in load_admin_ranks(). Reverting to legacy system.")
WRITE_FILE(GLOB.world_game_log, "Failed to connect to database in load_admin_ranks(). Reverting to legacy system.")
if(CONFIG_GET(flag/sql_enabled))
var/msg = "Failed to connect to database in load_admin_ranks(). Reverting to legacy system."
log_world(msg)
WRITE_FILE(GLOB.world_game_log, msg)
CONFIG_SET(flag/admin_legacy_system, TRUE)
load_admin_ranks()
return