Overload Database_Builder to add merge_where() which takes predefined

where clauses and adds them to the existing query.  Update all
existing queries that take an additional where clause to use it.

2 files changed, 2 insertions, 2 deletions

diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 7ceeefdf..157c388f 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -21,7 +21,7 @@ class Movies_Controller extends Items_Controller {
   public function _show($movie) {
     access::required("view", $movie);
 
-    $where = array("type != " => "album");
+    $where = array(array("type", "!=", "album"));
     $position = $movie->parent()->get_position($movie, $where);
     if ($position > 1) {
       list ($previous_item, $ignore, $next_item) =
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 0d7daac4..478447b1 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -21,7 +21,7 @@ class Photos_Controller extends Items_Controller {
   public function _show($photo) {
     access::required("view", $photo);
 
-    $where = array("type != " => "album");
+    $where = array(array("type", "!=", "album"));
     $position = $photo->parent()->get_position($photo, $where);
     if ($position > 1) {
       list ($previous_item, $ignore, $next_item) =