This commit is contained in:
Shish 2020-10-26 23:26:49 +00:00
parent 0977efa0d9
commit 2c8432c643

View File

@ -784,7 +784,7 @@ class Pools extends Extension
$query .= "AND i.rating IN (".Ratings::privs_to_sql(Ratings::get_user_class_privs($user)).")"; $query .= "AND i.rating IN (".Ratings::privs_to_sql(Ratings::get_user_class_privs($user)).")";
} }
if (Extension::is_enabled(TrashInfo::KEY)) { if (Extension::is_enabled(TrashInfo::KEY)) {
$query .= $database->scoreql_to_sql(" AND trash != :true", ["true"=>true]); $query .= " AND trash != :true";
} }
$result = $database->get_all( $result = $database->get_all(
@ -793,12 +793,17 @@ class Pools extends Extension
$query $query
ORDER BY p.image_order ASC ORDER BY p.image_order ASC
LIMIT :l OFFSET :o", LIMIT :l OFFSET :o",
["pid" => $poolID, "l" => $imagesPerPage, "o" => $pageNumber * $imagesPerPage] [
"pid" => $poolID,
"l" => $imagesPerPage,
"o" => $pageNumber * $imagesPerPage,
"true"=>true
]
); );
$totalPages = (int)ceil((int)$database->get_one( $totalPages = (int)ceil((int)$database->get_one(
"SELECT COUNT(*) FROM pool_images p $query", "SELECT COUNT(*) FROM pool_images p $query",
["pid" => $poolID] ["pid" => $poolID, "true"=>true]
) / $imagesPerPage); ) / $imagesPerPage);
$images = []; $images = [];