james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

php...

Browse Source
This commit is contained in:
Shish 2020-10-26 23:32:56 +00:00
parent 533ea85da9
commit 73022f06dd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/pools/main.php
View File

@ -777,6 +777,7 @@ class Pools extends Extension
INNER JOIN images AS i ON i.id = p.image_id INNER JOIN images AS i ON i.id = p.image_id
WHERE p.pool_id = :pid WHERE p.pool_id = :pid
"; ";
$params = [];
// WE CHECK IF THE EXTENSION RATING IS INSTALLED, WHICH VERSION AND IF IT // WE CHECK IF THE EXTENSION RATING IS INSTALLED, WHICH VERSION AND IF IT
// WORKS TO SHOW/HIDE SAFE, QUESTIONABLE, EXPLICIT AND UNRATED IMAGES FROM USER // WORKS TO SHOW/HIDE SAFE, QUESTIONABLE, EXPLICIT AND UNRATED IMAGES FROM USER
@ -785,6 +786,7 @@ class Pools extends Extension
} }
if (Extension::is_enabled(TrashInfo::KEY)) { if (Extension::is_enabled(TrashInfo::KEY)) {
$query .= " AND trash != :true"; $query .= " AND trash != :true";
$params["true"] = true;
} }
$result = $database->get_all( $result = $database->get_all(
@ -797,13 +799,12 @@ class Pools extends Extension
"pid" => $poolID, "pid" => $poolID,
"l" => $imagesPerPage, "l" => $imagesPerPage,
"o" => $pageNumber * $imagesPerPage, "o" => $pageNumber * $imagesPerPage,
"true"=>true ] + $params
]
); );
$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, "true"=>true] ["pid" => $poolID] + $params
) / $imagesPerPage); ) / $imagesPerPage);
$images = []; $images = [];