From d62f4908146f2bdfb396bff06f74afb62995e4a3 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Mon, 25 Apr 2016 20:12:36 -0700
Subject: Setup was horked after this commit and I couldn't easily make it
 right so reverting - will try again at a future date Revert "remove global db
 variable"

This reverts commit c3b0c0f32a17649503db67f208cce6f9e0cdc322.
---
 include/cli_startup.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include/cli_startup.php')

diff --git a/include/cli_startup.php b/include/cli_startup.php
index a226f1345..a99164d4c 100644
--- a/include/cli_startup.php
+++ b/include/cli_startup.php
@@ -1,7 +1,6 @@
 <?php /** @file */
 
 require_once('boot.php');
-require_once('include/dba/dba_driver.php');
 
 // Everything we need to boot standalone 'background' processes
 
@@ -15,7 +14,7 @@ function cli_startup() {
 
 	App::init();
   
-	if(! DBA::$dba) {
+	if(is_null($db)) {
 	    @include(".htconfig.php");
 
 		$a->convert();
@@ -26,7 +25,8 @@ function cli_startup() {
 		App::$timezone = ((x($default_timezone)) ? $default_timezone : 'UTC');
 		date_default_timezone_set(App::$timezone);
 
-	    $db = DBA::dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type);
+    	require_once('include/dba/dba_driver.php');
+	    $db = dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type);
     	unset($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type);
   	};
 
-- 
cgit v1.2.3