Merge branch 'rhymix:master' into master

This commit is contained in:
Lastorder 2025-05-26 06:58:12 +09:00 committed by GitHub
commit cb1fd188ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
111 changed files with 4286 additions and 5469 deletions

View file

@ -20,6 +20,7 @@ class Board extends ModuleObject
'user_name',
'nick_name',
'user_id',
'regdate',
'tag',
];

View file

@ -60,11 +60,6 @@
<route route="$document_srl:int" priority="100" />
<route route="$document_srl:int/" priority="100" />
<route route="$document_srl:int/comment/$comment_srl:int" priority="100" />
<route route="$document_srl:int/page/$page:int" priority="100" />
<route route="category/$category:int/search/$search_target:word/$search_keyword:any" priority="60" />
<route route="category/$category:int/search/$search_target:word/$search_keyword:any/page/$page:int" priority="60" />
<route route="search/$search_target:word/$search_keyword:any" priority="50" />
<route route="search/$search_target:word/$search_keyword:any/page/$page:int" priority="50" />
<route route="category/$category:int" priority="40" />
<route route="category/$category:int/page/$page:int" priority="40" />
<route route="page/$page:int" priority="10" />

View file

@ -13,7 +13,7 @@
if (match && match[1] === window.current_mid) {
newpath = location.pathname.replace(/\/(comment|page)\/([0-9]+)$/, '');
}
if (location.pathname.match(/\/([0-9]+)$/) && location.search.match(/^\?category=[0-9]+$/)) {
if (location.pathname.match(/\/([0-9]+)$/) && location.search.match(/^\?(category|comment_srl|page)=[0-9]+$/)) {
newpath = newpath ? newpath : location.pathname;
}
if (newpath && location.hash && location.hash != '#') {