diff options
author | Andy Staudacher <andy.st@gmail.com> | 2010-02-02 13:41:50 -0800 |
---|---|---|
committer | Andy Staudacher <andy.st@gmail.com> | 2010-02-02 13:41:50 -0800 |
commit | 31aaf7555f51dd80cf1e97fd3c20a1c245cbf61b (patch) | |
tree | 594ca1cebbe5b8b58b4c50cb3c88487574dba712 /modules/gallery/tests/Database_Test.php | |
parent | be5f38adea89bdb95be359aea3d97615b6b530a3 (diff) | |
parent | 3c3671cff25f28e21a702b1f665a6baa282d045f (diff) |
Merge commit 'upstream/master'
Diffstat (limited to 'modules/gallery/tests/Database_Test.php')
-rw-r--r-- | modules/gallery/tests/Database_Test.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/gallery/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php index e58f73eb..861f7bba 100644 --- a/modules/gallery/tests/Database_Test.php +++ b/modules/gallery/tests/Database_Test.php @@ -168,12 +168,12 @@ class Database_Mock extends Database { return array("test"); } - public function quote_column($val) { - return "[$val]"; + public function quote_column($val, $alias=null) { + return $alias ? "[$val,$alias]" : "[$val]"; } - public function quote_table($val) { - return "[$val]"; + public function quote_table($val, $alias=null) { + return $alias ? "[$val,$alias]" : "[$val]"; } public function quote($val) { |