merge upstream changes into pr0booru theme; re-fix upload form count

Giraffaman · Apr 12, 2024 · 2f69aa9 · 2f69aa9
1 parent 29cf5ff
commit 2f69aa9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/ext/upload/theme.php b/ext/upload/theme.php
@@ -119,7 +119,13 @@ protected function build_upload_list(): HTMLElement
             )
         );
 
-        for ($i = 0; $i < $upload_count; $i++) {
+        # probably not a good idea to show more file inputs than max_file_uploads
+        if($form_count > $upload_count) {
+            $form_count = $upload_count;
+        } elseif ($form_count < 1) {
+            $form_count = 1;
+        }
+        for ($i = 0; $i < $form_count; $i++) {
             $specific_fields = emptyHTML();
             $usfbe = send_event(new UploadSpecificBuildingEvent((string)$i));
             foreach ($usfbe->get_parts() as $part) {

diff --git a/themes/pr0booru/index.theme.php b/themes/pr0booru/index.theme.php
@@ -62,7 +62,7 @@ protected function build_table(array $images, ?string $query): string
         $h_query = html_escape($query);
         $table = "<div class='shm-image-list' data-query='$h_query'>";
         foreach ($images as $image) {
-            $table .= "\t<span class=\"thumb\">" . $this->build_thumb_html($image) . "</span>\n";
+            $table .= $this->build_thumb_html($image) . "\n";
         }
         $table .= "</div>";
         return $table;