Convert all DB where() calls to take 3 arguments.

Convert all open_paren() calls to and_open() or or_open() as appropriate.

3 files changed, 13 insertions, 13 deletions

diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index b6a55679..b4241e89 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -73,7 +73,7 @@ class exif_Core {
     }
     $item->save();
 
-    $record = ORM::factory("exif_record")->where("item_id", $item->id)->find();
+    $record = ORM::factory("exif_record")->where("item_id", "=", $item->id)->find();
     if (!$record->loaded()) {
       $record->item_id = $item->id;
     }
@@ -86,7 +86,7 @@ class exif_Core {
   static function get($item) {
     $exif = array();
     $record = ORM::factory("exif_record")
-      ->where("item_id", $item->id)
+      ->where("item_id", "=", $item->id)
       ->find();
     if (!$record->loaded()) {
       return array();
@@ -143,11 +143,11 @@ class exif_Core {
       ->select("items.id")
       ->from("items")
       ->join("exif_records", "items.id", "exif_records.item_id", "left")
-      ->where("type", "photo")
-      ->open_paren()
-      ->where("exif_records.item_id", null)
-      ->orwhere("exif_records.dirty", 1)
-      ->close_paren()
+      ->where("type", "=", "photo")
+      ->and_open()
+      ->where("exif_records.item_id", "=", null)
+      ->orwhere("exif_records.dirty", "=", 1)
+      ->close()
       ->get()
       ->count();
 
diff --git a/modules/exif/helpers/exif_task.php b/modules/exif/helpers/exif_task.php
index 7c4c97c4..1a449fc7 100644
--- a/modules/exif/helpers/exif_task.php
+++ b/modules/exif/helpers/exif_task.php
@@ -44,11 +44,11 @@ class exif_task_Core {
       $start = microtime(true);
       foreach (ORM::factory("item")
                ->join("exif_records", "items.id", "exif_records.item_id", "left")
-               ->where("type", "photo")
-               ->open_paren()
-               ->where("exif_records.item_id", null)
-               ->orwhere("exif_records.dirty", 1)
-               ->close_paren()
+               ->where("type", "=", "photo")
+               ->and_open()
+               ->where("exif_records.item_id", "=", null)
+               ->orwhere("exif_records.dirty", "=", 1)
+               ->close()
                ->find_all() as $item) {
         // The query above can take a long time, so start the timer after its done
         // to give ourselves a little time to actually process rows.
diff --git a/modules/exif/helpers/exif_theme.php b/modules/exif/helpers/exif_theme.php
index bb6926d3..db51f305 100644
--- a/modules/exif/helpers/exif_theme.php
+++ b/modules/exif/helpers/exif_theme.php
@@ -24,7 +24,7 @@ class exif_theme_Core {
       $record = Database::instance()
         ->select("key_count")
         ->from("exif_records")
-        ->where("item_id", $item->id)
+        ->where("item_id", "=", $item->id)
         ->get()
         ->current();
       if ($record && $record->key_count) {