0ct0pu5/forkbb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update Page\Search

Browse source
This commit is contained in:
Visman 2021-02-13 13:29:15 +07:00
parent 52725b7c77
commit 0319bd280a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Controllers/Routing.php
View file

@ -163,7 +163,7 @@ class Routing
$r->add(
$r::GET,
'/search[/user/{uid|i:[2-9]|[1-9]\d+}]/{action:(?!search)[a-z_]+}[/in_forum/{forum:[1-9]\d*}][/{page|i:[1-9]\d*}]',
'/search[/user/{uid|i:[2-9]|[1-9]\d+}]/{action:(?!search)[a-z_]+}[/in_forum/{forum|i:[1-9]\d*}][/{page|i:[1-9]\d*}]',
'Search:action',
'SearchAction'
);

6
app/Models/Pages/Search.php
View file

@ -409,18 +409,18 @@ class Search extends Page
{
$this->c->Lang->load('search');
$forum = isset($args['forum']) ? (int) $args['forum'] : 0;
$forum = $args['forum'] ?? 0;
$forum = $this->c->forums->get($forum);
if (! $forum instanceof Forum) {
return $this->c->Message->message('Bad request');
}
$model = $this->c->search;
$model->page = isset($args['page']) ? (int) $args['page'] : 1;
$model->page = $args['page'] ?? 1;
$action = $args['action'];
$asTopicsList = true;
$list = false;
$uid = isset($args['uid']) ? (int) $args['uid'] : null;
$uid = $args['uid'] ?? null;
$subIndex = [
'topics_with_your_posts' => 'with-your-posts',
'latest_active_topics' => 'latest',