Static method getInstance() conflicts with getInstance() in class BaseRegistry,

[core.git] / inc / classes / middleware / database / class_DatabaseConnection.php

diff --git a/inc/classes/middleware/database/class_DatabaseConnection.php b/inc/classes/middleware/database/class_DatabaseConnection.php
index a175f86182ee21ac76f76957fb266efb0d72abb5..0a688c39638799f2a2d0cf01628ac2d21d350abf 100644 (file)
--- a/inc/classes/middleware/database/class_DatabaseConnection.php
+++ b/inc/classes/middleware/database/class_DatabaseConnection.php
@@ -33,10 +33,10 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
        );
 
        // The real database layer
-       private $dbLayer = null;
+       private $dbLayer = NULL;
 
        // An instance of this class
-       private static $thisInstance = null;
+       private static $thisInstance = NULL;
 
        /**
         * Protected constructor
@@ -51,23 +51,23 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
        // Create new database connection layer
        public static final function createDatabaseConnection (DebugMiddleware $debugInstance, DatabaseFrontendInterface $dbLayer) {
                // Get instance
-               $dbInstance = new DatabaseConnection();
+               $databaseInstance = new DatabaseConnection();
 
                // Set debug output handler
-               $dbInstance->setDebugInstance($debugInstance);
+               $databaseInstance->setDebugInstance($debugInstance);
 
                // Set database layer
-               $dbInstance->setDatabaseLayer($dbLayer);
+               $databaseInstance->setDatabaseLayer($dbLayer);
 
                // Set db instance
-               self::$thisInstance = $dbInstance;
+               self::$thisInstance = $databaseInstance;
 
                // Return instance
-               return $dbInstance;
+               return $databaseInstance;
        }
 
        // Get an instance of this class
-       public static final function getInstance () {
+       public static final function getSelfInstance () {
                return self::$thisInstance;
        }
 
@@ -120,7 +120,7 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
                $this->dbLayer->connectToDatabase();
 
                // Get result from query
-               $result = $this->dbLayer->querySelect('array', $tableName, $criteriaInstance);
+               $result = $this->dbLayer->querySelect($tableName, $criteriaInstance);
 
                // Return the result
                return $result;