install issue (memory exhausted) due to incorrect db open check

diff --git a/include/dba.php b/include/dba.php
index e58abb1a1210e29e3450fe3c5c2ca995ecffdce6..d3da8eae055471b656142dad8ee6b63fb0944740 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -16,11 +16,16 @@ class dba {
 
        private $debug = 0;
        private $db;
+       public  $connected = false;
 
        function __construct($server,$user,$pass,$db,$install = false) {
                $this->db = @new mysqli($server,$user,$pass,$db);
-               if((mysqli_connect_errno()) && (! $install))
-                       system_unavailable();    
+               if((mysqli_connect_errno()) && (! $install)) {
+                       $this->db = null;
+                       system_unavailable();
+               }
+               else
+                       $this->connected = true;    
        }
 
        public function getdb() {
@@ -114,7 +119,7 @@ function dbg($state) {
 if(! function_exists('dbesc')) { 
 function dbesc($str) {
        global $db;
-       if($db)
+       if($db->connected)
                return($db->escape($str));
        else
                return(str_replace("'","\\'",$str));
@@ -133,7 +138,7 @@ function q($sql) {
        $args = func_get_args();
        unset($args[0]);
 
-       if($db) {
+       if($db->connected) {
                $ret = $db->q(vsprintf($sql,$args));
                return $ret;
        }
@@ -160,7 +165,10 @@ if(! function_exists('dbq')) {
 function dbq($sql) {
 
        global $db;
-       $ret = $db->q($sql);
+       if($db->connected)
+               $ret = $db->q($sql);
+       else
+               $ret = false;
        return $ret;
 }}
 

diff --git a/index.php b/index.php
index 77b5647f2bbfc6d583103fa836de494222137c8f..bbd2c81cd67468adb70227688d9993056eab30b4 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,5 +1,5 @@
 <?php
-
+error_reporting(E_ERROR | E_WARNING | E_PARSE);
 /**
  *
  * Friendika