From fd0c0a608a5de2b26c29d3c44a7929e5a3b2c042 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Mon, 18 May 2009 00:14:07 +0000 Subject: Updated kohana and modules/unit_test to upstream r4356 --- kohana/libraries/Database.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kohana/libraries/Database.php') diff --git a/kohana/libraries/Database.php b/kohana/libraries/Database.php index 49241675..59e47621 100644 --- a/kohana/libraries/Database.php +++ b/kohana/libraries/Database.php @@ -341,10 +341,10 @@ class Database_Core { foreach ($sql as $val) { - if (($val = trim($val)) === '') continue; - if (is_string($val)) { + if (($val = trim($val)) === '') continue; + // TODO: Temporary solution, this should be moved to database driver (AS is checked for twice) if (stripos($val, ' AS ') !== FALSE) { @@ -1187,7 +1187,7 @@ class Database_Core { { $this->link or $this->connect(); - return $this->driver->list_tables($this); + return $this->driver->list_tables(); } /** -- cgit v1.2.3