From b8757fb45624d038e1f072fa40fb439608532164 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 3 Mar 2011 15:41:08 -0800
Subject: [PATCH] make sure db queries never get called if the database isn't
 open

---
 boot.php        |  2 +-
 include/dba.php | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/boot.php b/boot.php
index 3cf01b4a0d..a97f858140 100644
--- a/boot.php
+++ b/boot.php
@@ -3,7 +3,7 @@
 set_time_limit(0);
 
 define ( 'BUILD_ID',               1039   );
-define ( 'FRIENDIKA_VERSION',      '2.10.0908' );
+define ( 'FRIENDIKA_VERSION',      '2.10.0909' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.1'  );
 
 define ( 'EOL',                    "<br />\r\n"     );
diff --git a/include/dba.php b/include/dba.php
index b05a1cabf4..b89648bcac 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -20,12 +20,14 @@ class dba {
 
 	function __construct($server,$user,$pass,$db,$install = false) {
 		$this->db = @new mysqli($server,$user,$pass,$db);
-		if((mysqli_connect_errno()) && (! $install)) {
-			$this->db = null;
-			system_unavailable();
+		if(! mysql_connect_errno()) {
+			$this->connected = true;
+		}
+		else {
+			$this->db = null;
+			if(! $install)
+				system_unavailable();
 		}
-		else
-			$this->connected = true;    
 	}
 
 	public function getdb() {
@@ -34,7 +36,7 @@ class dba {
 
 	public function q($sql) {
 		
-		if(! $this->db )
+		if((! $this->db) || (! $this->connected))
 			return false;
 		
 		$result = @$this->db->query($sql);
@@ -92,7 +94,8 @@ class dba {
 	}
 
 	public function escape($str) {
-		return @$this->db->real_escape_string($str);
+		if($this->db && $this->connected)
+			return @$this->db->real_escape_string($str);
 	}
 
 	function __destruct() {