only link to post/list when you actually want post/list, if you want …

…just a default page, leave it empty
shish · Aug 18, 2023 · 23e36b4 · 23e36b4
1 parent 7f048ff
commit 23e36b4
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/core/urls.php b/core/urls.php
@@ -27,7 +27,7 @@ public function make_link(): string
  * Figure out the correct way to link to a page, taking into account
  * things like the nice URLs setting.
  *
- * eg make_link("post/list") becomes "/v2/index.php?q=post/list"
+ * eg make_link("foo/bar") becomes "/v2/index.php?q=foo/bar"
  */
 function make_link(?string $page=null, ?string $query=null, ?string $fragment=null): string
 {

diff --git a/ext/approval/main.php b/ext/approval/main.php
@@ -116,7 +116,7 @@ public function onDisplayingImage(DisplayingImageEvent $event)
 
         if (!$this->check_permissions(($event->image))) {
             $page->set_mode(PageMode::REDIRECT);
-            $page->set_redirect(make_link("post/list"));
+            $page->set_redirect(make_link());
         }
     }
 

diff --git a/ext/comment/theme.php b/ext/comment/theme.php
@@ -29,7 +29,7 @@ public function display_comment_list(array $images, int $page_number, int $total
 
         $h_prev = ($page_number <= 1) ? "Prev" :
             '<a href="'.make_link('comment/list/'.$prev).'">Prev</a>';
-        $h_index = "<a href='".make_link("post/list")."'>Index</a>";
+        $h_index = "<a href='".make_link()."'>Index</a>";
         $h_next = ($page_number >= $total_pages) ? "Next" :
             '<a href="'.make_link('comment/list/'.$next).'">Next</a>';
 
@@ -186,7 +186,7 @@ public function display_all_user_comments(array $comments, int $page_number, int
         //$query = empty($u_tags) ? "" : '/'.$u_tags;
 
         $h_prev = ($page_number <= 1) ? "Prev" : "<a href='$prev'>Prev</a>";
-        $h_index = "<a href='".make_link("post/list")."'>Index</a>";
+        $h_index = "<a href='".make_link()."'>Index</a>";
         $h_next = ($page_number >= $total_pages) ? "Next" : "<a href='$next'>Next</a>";
 
         $page->set_title(html_escape($user->name)."'s comments");

diff --git a/ext/image/main.php b/ext/image/main.php
@@ -91,7 +91,7 @@ public function onPageRequest(PageRequestEvent $event)
                         redirect_to_next_image($image);
                     } else {
                         $page->set_mode(PageMode::REDIRECT);
-                        $page->set_redirect(referer_or(make_link("post/list"), ['post/view']));
+                        $page->set_redirect(referer_or(make_link(), ['post/view']));
                     }
                 }
             }

diff --git a/ext/private_image/main.php b/ext/private_image/main.php
@@ -119,7 +119,7 @@ public function onDisplayingImage(DisplayingImageEvent $event)
 
         if ($event->image->private===true && $event->image->owner_id!=$user->id && !$user->can(Permissions::SET_OTHERS_PRIVATE_IMAGES)) {
             $page->set_mode(PageMode::REDIRECT);
-            $page->set_redirect(make_link("post/list"));
+            $page->set_redirect(make_link());
         }
     }
 

diff --git a/ext/rating/main.php b/ext/rating/main.php
@@ -172,7 +172,7 @@ public function onDisplayingImage(DisplayingImageEvent $event)
          **/
         if (!$this->check_permissions($event->image)) {
             $page->set_mode(PageMode::REDIRECT);
-            $page->set_redirect(make_link("post/list"));
+            $page->set_redirect(make_link());
         }
     }
 
@@ -394,7 +394,7 @@ public function onPageRequest(PageRequestEvent $event)
                 #		on image_tags.tag_id = tags.id where tags.tag = :tag);
                 #	", ['rating'=>$_POST["rating"], 'tag'=>$_POST["tag"]]);
                 $page->set_mode(PageMode::REDIRECT);
-                $page->set_redirect(make_link("post/list"));
+                $page->set_redirect(make_link());
             }
         }
     }

diff --git a/ext/regen_thumb/main.php b/ext/regen_thumb/main.php
@@ -37,7 +37,7 @@ public function onPageRequest(PageRequestEvent $event)
             }
 
             $page->set_mode(PageMode::REDIRECT);
-            $page->set_redirect(make_link("post/list"));
+            $page->set_redirect(make_link());
         }
     }
 

diff --git a/ext/trash/main.php b/ext/trash/main.php
@@ -71,7 +71,7 @@ public function onDisplayingImage(DisplayingImageEvent $event)
 
         if (!$this->check_permissions(($event->image))) {
             $page->set_mode(PageMode::REDIRECT);
-            $page->set_redirect(make_link("post/list"));
+            $page->set_redirect(make_link());
         }
     }
 

diff --git a/ext/user/main.php b/ext/user/main.php
@@ -840,7 +840,7 @@ private function delete_user(Page $page, bool $with_images=false, bool $with_com
             );
 
             $page->set_mode(PageMode::REDIRECT);
-            $page->set_redirect(make_link("post/list"));
+            $page->set_redirect(make_link());
         }
     }
 }