[Oscss-commit] SF.net SVN: oscss:[4224] trunk/catalog/common/classes/Database.php

[<os...@us...>]

Revision: 4224
          http://oscss.svn.sourceforge.net/oscss/?rev=4224&view=rev
Author:   oscim
Date:     2012-04-13 15:37:03 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
Correction reliquat integration Class Database

Modified Paths:
--------------
    trunk/catalog/common/classes/Database.php

Modified: trunk/catalog/common/classes/Database.php
===================================================================
--- trunk/catalog/common/classes/Database.php	2012-04-13 15:28:10 UTC (rev 4223)
+++ trunk/catalog/common/classes/Database.php	2012-04-13 15:37:03 UTC (rev 4224)
@@ -130,23 +130,19 @@
     * @param  boolean
     * @return array
     */
-  public function listTables($strDatabase=false, $blnNoCache=false)
-  {
-	  if (!$strDatabase)
-	  {
-		  $strDatabase = $GLOBALS['TL_CONFIG']['dbDatabase'];
+  public function listTables($strDatabase=false, $blnNoCache=false){
+	  if (!$strDatabase){
+		  $strDatabase = self::DB;
 	  }
 
-	  if (!$blnNoCache && isset($this->arrCache[$strDatabase]))
-	  {
+	  if (!$blnNoCache && isset($this->arrCache[$strDatabase])){
 		  return $this->arrCache[$strDatabase];
 	  }
 
 	  $arrReturn = array();
-	  $arrTables = $this->execute(sprintf($this->strListTables, $strDatabase))->fetchAllAssoc();
+	  $arrTables = $this->query(sprintf($this->strListTables, $strDatabase))->fetchAllAssoc();
 
-	  foreach ($arrTables as $arrTable)
-	  {
+	  foreach ($arrTables as $arrTable){
 		  $arrReturn[] = current($arrTable);
 	  }
 
@@ -162,8 +158,7 @@
 	 * @param  boolean
 	 * @return boolean
 	 */
-	public function tableExists($strTable, $strDatabase=false, $blnNoCache=false)
-	{
+	public function tableExists($strTable, $strDatabase=false, $blnNoCache=false){
 		return in_array($strTable, $this->listTables($strDatabase, $blnNoCache));
 	}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.