merged 2 if() into one as requested by CR

[friendica.git] / include / dba_pdo.php

diff --git a/include/dba_pdo.php b/include/dba_pdo.php
index b48aba44876d5fc6bf0d64d21c211d3374338114..a44c447af20fa568d8ed15bb6e6082fc5330b182 100644 (file)
--- a/include/dba_pdo.php
+++ b/include/dba_pdo.php
@@ -44,7 +44,7 @@ class dba {
        public  $error = false;
 
        function __construct($server,$user,$pass,$db,$install = false) {
-               global $a;
+               $a = get_app();
     
     # work around, to store the database - configuration in DDDBL
     $objDataObjectPool = new \DDDBL\DataObjectPool('Database-Definition');
@@ -99,7 +99,7 @@ class dba {
        }
 
        public function q($sql, $onlyquery = false) {
-               global $a;
+               $a = get_app();
 
     $strHandler = (true === $onlyquery) ? 'PDOStatement' : 'MULTI';
     
@@ -232,16 +232,6 @@ class dba {
                }
        }
 
-       /**
-        * Checks if $array is a filled array with at least one entry.
-        *
-        * @param       $array  mixed   A filled array with at least one entry
-        * @return      Whether $array is a filled array
-        */
-       public function is_result ($array) {
-               return (is_array($array) && count($array) > 0);
-       }
-
        function __destruct() {
                if ($this->db) 
                  \DDDBL\disconnect();