From bd9808081e11ed7dc27928ca555862f422dc833d Mon Sep 17 00:00:00 2001
From: Matthew Barbour <matthew@darkholme.net>
Date: Wed, 24 Jun 2020 09:40:25 -0500
Subject: [PATCH] Added false is_content flags to several blocks so that the
 404 extension can work properly

---
 ext/upload/theme.php            | 4 +++-
 ext/user/theme.php              | 4 +++-
 themes/danbooru/user.theme.php  | 6 ++++--
 themes/danbooru2/user.theme.php | 6 ++++--
 themes/lite/user.theme.php      | 4 +++-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ext/upload/theme.php b/ext/upload/theme.php
index a512b744..5de75ddd 100644
--- a/ext/upload/theme.php
+++ b/ext/upload/theme.php
@@ -4,7 +4,9 @@ class UploadTheme extends Themelet
 {
     public function display_block(Page $page)
     {
-        $page->add_block(new Block("Upload", $this->build_upload_block(), "left", 20));
+        $b = new Block("Upload", $this->build_upload_block(), "left", 20);
+        $b->is_content = false;
+        $page->add_block($b);
     }
 
     public function display_full(Page $page)
diff --git a/ext/user/theme.php b/ext/user/theme.php
index dbab5ae2..aff6c1dc 100644
--- a/ext/user/theme.php
+++ b/ext/user/theme.php
@@ -49,7 +49,9 @@ class UserPageTheme extends Themelet
             $html->appendChild(BR());
             $html->appendChild(A(["href"=>$part["link"]], $part["name"]));
         }
-        $page->add_block(new Block("User Links", (string)$html, "left", 90));
+        $b = new Block("User Links", (string)$html, "left", 90);
+        $b->is_content = false;
+        $page->add_block($b);
     }
 
     public function display_signup_page(Page $page)
diff --git a/themes/danbooru/user.theme.php b/themes/danbooru/user.theme.php
index 2293356a..406dd73e 100644
--- a/themes/danbooru/user.theme.php
+++ b/themes/danbooru/user.theme.php
@@ -48,7 +48,9 @@ class CustomUserPageTheme extends UserPageTheme
             }
             $html .= "<li><a href='{$part["link"]}'>{$part["name"]}</a>";
         }
-        $page->add_block(new Block("User Links", $html, "user", 90));
+        $b = new Block("User Links", $html, "user", 90);
+        $b->is_content = false;
+        $page->add_block($b);
     }
 
     public function display_signup_page(Page $page)
@@ -59,7 +61,7 @@ class CustomUserPageTheme extends UserPageTheme
         $tfe = new TextFormattingEvent($tac);
         send_event($tfe);
         $tac = $tfe->formatted;
-        
+
         $reca = "<tr><td colspan='2'>".captcha_get_html()."</td></tr>";
 
         if (empty($tac)) {
diff --git a/themes/danbooru2/user.theme.php b/themes/danbooru2/user.theme.php
index 2293356a..406dd73e 100644
--- a/themes/danbooru2/user.theme.php
+++ b/themes/danbooru2/user.theme.php
@@ -48,7 +48,9 @@ class CustomUserPageTheme extends UserPageTheme
             }
             $html .= "<li><a href='{$part["link"]}'>{$part["name"]}</a>";
         }
-        $page->add_block(new Block("User Links", $html, "user", 90));
+        $b = new Block("User Links", $html, "user", 90);
+        $b->is_content = false;
+        $page->add_block($b);
     }
 
     public function display_signup_page(Page $page)
@@ -59,7 +61,7 @@ class CustomUserPageTheme extends UserPageTheme
         $tfe = new TextFormattingEvent($tac);
         send_event($tfe);
         $tac = $tfe->formatted;
-        
+
         $reca = "<tr><td colspan='2'>".captcha_get_html()."</td></tr>";
 
         if (empty($tac)) {
diff --git a/themes/lite/user.theme.php b/themes/lite/user.theme.php
index 898a9891..805825e3 100644
--- a/themes/lite/user.theme.php
+++ b/themes/lite/user.theme.php
@@ -48,7 +48,9 @@ class CustomUserPageTheme extends UserPageTheme
             }
             $html .= "<a href='{$part["link"]}' class='tab'>{$part["name"]}</a>";
         }
-        $page->add_block(new Block("User Links", $html, "user", 90));
+        $b = new Block("User Links", $html, "user", 90);
+        $b->is_content = false;
+        $page->add_block($b);
     }
 
     public function display_signup_page(Page $page)