Skip to content
Permalink
Browse files Browse the repository at this point in the history
fix #1535
  • Loading branch information
joyqi committed Feb 21, 2023
1 parent 16d21f0 commit f9ede54
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion var/Widget/Archive.php
Expand Up @@ -646,7 +646,7 @@ public function execute()

/** 处理搜索结果跳转 */
if (isset($this->request->s)) {
$filterKeywords = $this->request->filter('search')->s;
$filterKeywords = $this->request->filter('search')->get('s');

/** 跳转到搜索页 */
if (null != $filterKeywords) {
Expand Down
8 changes: 4 additions & 4 deletions var/Widget/Menu.php
Expand Up @@ -127,10 +127,10 @@ public function execute()
$panelTable = unserialize($this->options->panelTable);
$extendingParentMenu = empty($panelTable['parent']) ? [] : $panelTable['parent'];
$extendingChildMenu = empty($panelTable['child']) ? [] : $panelTable['child'];
$currentUrl = $this->request->makeUriByRequest();
$currentUrl = $this->request->getRequestUrl();
$adminUrl = $this->options->adminUrl;
$menu = [];
$defaultChildeNode = [null, null, null, 'administrator', false, null];
$defaultChildNode = [null, null, null, 'administrator', false, null];

$currentUrlParts = parse_url($currentUrl);
$currentUrlParams = [];
Expand Down Expand Up @@ -158,7 +158,7 @@ public function execute()

foreach ($childNodes[$key] as $inKey => $childNode) {
// magic merge
$childNode += $defaultChildeNode;
$childNode += $defaultChildNode;
[$name, $title, $url, $access] = $childNode;

$hidden = $childNode[4] ?? false;
Expand Down Expand Up @@ -255,7 +255,7 @@ public function execute()
}

$this->menu = $menu;
$this->currentUrl = $currentUrl;
$this->currentUrl = Common::safeUrl($currentUrl);
}

/**
Expand Down

0 comments on commit f9ede54

Please sign in to comment.