summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'modules/gallery/controllers')
-rw-r--r--modules/gallery/controllers/admin_maintenance.php6
-rw-r--r--modules/gallery/controllers/albums.php12
-rw-r--r--modules/gallery/controllers/file_proxy.php4
-rw-r--r--modules/gallery/controllers/l10n_client.php6
-rw-r--r--modules/gallery/controllers/move.php4
-rw-r--r--modules/gallery/controllers/movies.php10
-rw-r--r--modules/gallery/controllers/photos.php12
7 files changed, 27 insertions, 27 deletions
diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
index 3b896553..6377f40f 100644
--- a/modules/gallery/controllers/admin_maintenance.php
+++ b/modules/gallery/controllers/admin_maintenance.php
@@ -41,9 +41,9 @@ class Admin_Maintenance_Controller extends Admin_Controller {
$view->content = new View("admin_maintenance.html");
$view->content->task_definitions = task::get_definitions();
$view->content->running_tasks = ORM::factory("task")
- ->where("done", 0)->order_by("updated", "DESC")->find_all();
+ ->where("done", "=", 0)->order_by("updated", "DESC")->find_all();
$view->content->finished_tasks = ORM::factory("task")
- ->where("done", 1)->order_by("updated", "DESC")->find_all();
+ ->where("done", "=", 1)->order_by("updated", "DESC")->find_all();
print $view;
}
@@ -164,7 +164,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
// Do it the long way so we can call delete and remove the cache.
$finished = ORM::factory("task")
- ->where(array("done" => 1))
+ ->where("done", "=", 1)
->find_all();
foreach ($finished as $task) {
task::remove($task->id);
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 19140891..431d98a0 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -126,12 +126,12 @@ class Albums_Controller extends Items_Controller {
if ($row = Database::instance()
->select(array("name", "slug"))
->from("items")
- ->where("parent_id", $album->parent_id)
- ->where("id <>", $album->id)
- ->open_paren()
- ->where("name", $form->edit_item->dirname->value)
- ->orwhere("slug", $form->edit_item->slug->value)
- ->close_paren()
+ ->where("parent_id", "=", $album->parent_id)
+ ->where("id", "<>", $album->id)
+ ->and_open()
+ ->where("name", "=", $form->edit_item->dirname->value)
+ ->orwhere("slug", "=", $form->edit_item->slug->value)
+ ->close()
->get()
->current()) {
if ($row->name == $form->edit_item->dirname->value) {
diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index 11d858c0..53afe0e4 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -57,7 +57,7 @@ class File_Proxy_Controller extends Controller {
$path = preg_replace("|/.album.jpg$|", "", $path);
// We now have the relative path to the item. Search for it in the path cache
- $item = ORM::factory("item")->where("relative_path_cache", $path)->find();
+ $item = ORM::factory("item")->where("relative_path_cache", "=", $path)->find();
if (!$item->loaded()) {
// We didn't turn it up. It's possible that the relative_path_cache is out of date here.
// There was fallback code, but bharat deleted it in 8f1bca74. If it turns out to be
@@ -69,7 +69,7 @@ class File_Proxy_Controller extends Controller {
if (preg_match('/.jpg$/', $path)) {
foreach (array("flv", "mp4") as $ext) {
$movie_path = preg_replace('/.jpg$/', ".$ext", $path);
- $item = ORM::factory("item")->where("relative_path_cache", $movie_path)->find();
+ $item = ORM::factory("item")->where("relative_path_cache", "=", $movie_path)->find();
if ($item->loaded()) {
break;
}
diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index 2eda741c..30a18631 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -116,7 +116,7 @@ class L10n_Client_Controller extends Controller {
foreach (Database::instance()
->select("key", "message")
->from("incoming_translations")
- ->where(array("locale" => 'root'))
+ ->where("locale", "=", "root"))
->get()
->as_array() as $row) {
$calls[$row->key] = array(unserialize($row->message), array());
@@ -131,7 +131,7 @@ class L10n_Client_Controller extends Controller {
foreach (Database::instance()
->select("key", "translation")
->from("incoming_translations")
- ->where(array("locale" => $locale))
+ ->where("locale", "=", $locale)
->get()
->as_array() as $row) {
$translations[$row->key] = unserialize($row->translation);
@@ -140,7 +140,7 @@ class L10n_Client_Controller extends Controller {
foreach (Database::instance()
->select("key", "translation")
->from("outgoing_translations")
- ->where(array("locale" => $locale))
+ ->where("locale", "=", $locale)
->get()
->as_array() as $row) {
$translations[$row->key] = unserialize($row->translation);
diff --git a/modules/gallery/controllers/move.php b/modules/gallery/controllers/move.php
index 87b73436..863b13bb 100644
--- a/modules/gallery/controllers/move.php
+++ b/modules/gallery/controllers/move.php
@@ -64,8 +64,8 @@ class Move_Controller extends Controller {
$view->parent = $target;
$view->children = ORM::factory("item")
->viewable()
- ->where("type", "album")
- ->where("parent_id", $target->id)
+ ->where("type", "=", "album")
+ ->where("parent_id", "=", $target->id)
->find_all();
return $view;
}
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 3d5eac32..7ceeefdf 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -74,12 +74,12 @@ class Movies_Controller extends Items_Controller {
if ($row = Database::instance()
->select(array("name", "slug"))
->from("items")
- ->where("parent_id", $movie->parent_id)
+ ->where("parent_id", "=", $movie->parent_id)
->where("id <>", $movie->id)
- ->open_paren()
- ->where("name", $form->edit_item->filename->value)
- ->orwhere("slug", $form->edit_item->slug->value)
- ->close_paren()
+ ->and_open()
+ ->where("name", "=", $form->edit_item->filename->value)
+ ->orwhere("slug", "=", $form->edit_item->slug->value)
+ ->close()
->get()
->current()) {
if ($row->name == $form->edit_item->filename->value) {
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index f052eccd..0d7daac4 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -74,12 +74,12 @@ class Photos_Controller extends Items_Controller {
if ($row = Database::instance()
->select(array("name", "slug"))
->from("items")
- ->where("parent_id", $photo->parent_id)
- ->where("id <>", $photo->id)
- ->open_paren()
- ->where("name", $form->edit_item->filename->value)
- ->orwhere("slug", $form->edit_item->slug->value)
- ->close_paren()
+ ->where("parent_id", "=", $photo->parent_id)
+ ->where("id", "<>", $photo->id)
+ ->and_open()
+ ->where("name", "=", $form->edit_item->filename->value)
+ ->orwhere("slug", "=", $form->edit_item->slug->value)
+ ->close()
->get()
->current()) {
if ($row->name == $form->edit_item->filename->value) {
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-16 05:57:13 +0000