Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 8 insertions, 4 deletions

diff --git a/modules/kohana23_compat/libraries/MY_Database_Builder.php b/modules/kohana23_compat/libraries/MY_Database_Builder.php
index c82b6ac4..b2a5c92a 100644
--- a/modules/kohana23_compat/libraries/MY_Database_Builder.php
+++ b/modules/kohana23_compat/libraries/MY_Database_Builder.php
@@ -23,8 +23,10 @@ class Database_Builder extends Database_Builder_Core {
    * @chainable
    */
   public function merge_where($tuples) {
-    foreach ($tuples as $tuple) {
-      $this->where($tuple[0], $tuple[1], $tuple[2]);
+    if ($tuples) {
+      foreach ($tuples as $tuple) {
+        $this->where($tuple[0], $tuple[1], $tuple[2]);
+      }
     }
     return $this;
   }
@@ -34,8 +36,10 @@ class Database_Builder extends Database_Builder_Core {
    * @chainable
    */
   public function merge_or_where($tuples) {
-    foreach ($tuples as $tuple) {
-      $this->or_where($tuple[0], $tuple[1], $tuple[2]);
+    if ($tuples) {
+      foreach ($tuples as $tuple) {
+        $this->or_where($tuple[0], $tuple[1], $tuple[2]);
+      }
     }
     return $this;
   }