Explorar el Código

Update Page\Search

Visman hace 4 años
padre
commit
0319bd280a
Se han modificado 2 ficheros con 4 adiciones y 4 borrados
  1. 1 1
      app/Controllers/Routing.php
  2. 3 3
      app/Models/Pages/Search.php

+ 1 - 1
app/Controllers/Routing.php

@@ -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'
                 );

+ 3 - 3
app/Models/Pages/Search.php

@@ -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',