diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/exif/helpers/exif.php | 2 | ||||
| -rw-r--r-- | modules/exif/helpers/exif_task.php | 2 | ||||
| -rw-r--r-- | modules/search/helpers/search.php | 6 | ||||
| -rw-r--r-- | modules/search/helpers/search_task.php | 2 | ||||
| -rw-r--r-- | modules/server_add/controllers/server_add.php | 2 |
5 files changed, 6 insertions, 8 deletions
diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php index 3177e7eb..3baed177 100644 --- a/modules/exif/helpers/exif.php +++ b/modules/exif/helpers/exif.php @@ -145,7 +145,7 @@ class exif_Core { ->join("exif_records", "items.id", "exif_records.item_id", "left") ->where("type", "=", "photo") ->and_open() - ->where("exif_records.item_id", "=", null) + ->where("exif_records.item_id", "IS", null) ->or_where("exif_records.dirty", "=", 1) ->close() ->execute() diff --git a/modules/exif/helpers/exif_task.php b/modules/exif/helpers/exif_task.php index e25e2405..27352643 100644 --- a/modules/exif/helpers/exif_task.php +++ b/modules/exif/helpers/exif_task.php @@ -47,7 +47,7 @@ class exif_task_Core { ->join("exif_records", "items.id", "exif_records.item_id", "left") ->where("type", "=", "photo") ->and_open() - ->where("exif_records.item_id", "=", null) + ->where("exif_records.item_id", "IS", null) ->or_where("exif_records.dirty", "=", 1) ->close() ->find_all() as $item) { diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php index 9123df09..70a39272 100644 --- a/modules/search/helpers/search.php +++ b/modules/search/helpers/search.php @@ -73,15 +73,13 @@ class search_Core { static function stats() { $remaining = db::build() - ->select("items.id") ->from("items") ->join("search_records", "items.id", "search_records.item_id", "left") ->and_open() - ->where("search_records.item_id", "=", null) + ->where("search_records.item_id", "IS", null) ->or_where("search_records.dirty", "=", 1) ->close() - ->execute() - ->count(); + ->count_records(); $total = ORM::factory("item")->count_all(); $percent = round(100 * ($total - $remaining) / $total); diff --git a/modules/search/helpers/search_task.php b/modules/search/helpers/search_task.php index 6aa4a0d1..e039e493 100644 --- a/modules/search/helpers/search_task.php +++ b/modules/search/helpers/search_task.php @@ -45,7 +45,7 @@ class search_task_Core { $start = microtime(true); foreach (ORM::factory("item") ->join("search_records", "items.id", "search_records.item_id", "left") - ->where("search_records.item_id", "=", null) + ->where("search_records.item_id", "IS", null) ->or_where("search_records.dirty", "=", 1) ->find_all() as $item) { // The query above can take a long time, so start the timer after its done diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php index 3c3a6c2b..78e1620c 100644 --- a/modules/server_add/controllers/server_add.php +++ b/modules/server_add/controllers/server_add.php @@ -198,7 +198,7 @@ class Server_Add_Controller extends Admin_Controller { // they're done. $entries = ORM::factory("server_add_file") ->where("task_id", "=", $task->id) - ->where("item_id", "=", null) + ->where("item_id", "IS", null) ->order_by("id", "ASC") ->limit(10) ->find_all(); |