From ad1e52bf0589dbed129a7916835a2cb226348526 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Mon, 22 Jun 2020 16:08:04 +0100
Subject: [PATCH] DATABASE_TIMEOUT isn't set in the installer

---
 core/dbengine.php  | 4 +++-
 core/polyfills.php | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/dbengine.php b/core/dbengine.php
index cb46ab4f..66be9d2b 100644
--- a/core/dbengine.php
+++ b/core/dbengine.php
@@ -92,7 +92,9 @@ class PostgreSQL extends DBEngine
         } else {
             $db->exec("SET application_name TO 'shimmie [local]';");
         }
-        $this->set_timeout($db, DATABASE_TIMEOUT);
+        if (defined("DATABASE_TIMEOUT")) {
+            $this->set_timeout($db, DATABASE_TIMEOUT);
+        }
     }
 
     public function scoreql_to_sql(string $data): string
diff --git a/core/polyfills.php b/core/polyfills.php
index 38c82baf..d57d8b4c 100644
--- a/core/polyfills.php
+++ b/core/polyfills.php
@@ -770,4 +770,3 @@ function stringer($s)
     }
     return (string)$s;
 }
-