summaryrefslogtreecommitdiff
path: root/kohana/libraries/Database.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-05-18 00:14:07 +0000
committerBharat Mediratta <bharat@menalto.com>2009-05-18 00:14:07 +0000
commitfd0c0a608a5de2b26c29d3c44a7929e5a3b2c042 (patch)
tree387f2628cae3580b7f09682de6e908d002c5fbb0 /kohana/libraries/Database.php
parent5a6aef9c23930b1de609c9914297e0f97bc49a11 (diff)
Updated kohana and modules/unit_test to upstream r4356
Diffstat (limited to 'kohana/libraries/Database.php')
-rw-r--r--kohana/libraries/Database.php6
1 files changed, 3 insertions, 3 deletions
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();
}
/**