Upgrade to 3.7.2
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
|
||||
use Kirby\Cms\App;
|
||||
use Kirby\Cms\Find;
|
||||
use Kirby\Panel\Panel;
|
||||
|
||||
return [
|
||||
'account' => [
|
||||
@@ -18,16 +17,6 @@ return [
|
||||
return Find::file('account', $filename)->panel()->view();
|
||||
}
|
||||
],
|
||||
'account.logout' => [
|
||||
'pattern' => 'logout',
|
||||
'auth' => false,
|
||||
'action' => function () {
|
||||
if ($user = App::instance()->user()) {
|
||||
$user->logout();
|
||||
}
|
||||
Panel::go('login');
|
||||
},
|
||||
],
|
||||
'account.password' => [
|
||||
'pattern' => 'reset-password',
|
||||
'action' => fn () => ['component' => 'k-reset-password-view']
|
||||
|
21
kirby/config/areas/logout.php
Executable file
21
kirby/config/areas/logout.php
Executable file
@@ -0,0 +1,21 @@
|
||||
<?php
|
||||
|
||||
use Kirby\Panel\Panel;
|
||||
use Kirby\Toolkit\I18n;
|
||||
|
||||
return function ($kirby) {
|
||||
return [
|
||||
'icon' => 'user',
|
||||
'label' => I18n::translate('logout'),
|
||||
'views' => [
|
||||
'logout' => [
|
||||
'pattern' => 'logout',
|
||||
'auth' => false,
|
||||
'action' => function () use ($kirby) {
|
||||
$kirby->auth()->logout();
|
||||
Panel::go('login');
|
||||
},
|
||||
]
|
||||
]
|
||||
];
|
||||
};
|
@@ -55,8 +55,8 @@ return [
|
||||
$files = $files->filter('isReadable', true);
|
||||
|
||||
// search
|
||||
if ($this->search === true && empty($this->searchterm) === false) {
|
||||
$files = $files->search($this->searchterm);
|
||||
if ($this->search === true && empty($this->searchterm()) === false) {
|
||||
$files = $files->search($this->searchterm());
|
||||
}
|
||||
|
||||
// sort
|
||||
|
@@ -11,7 +11,7 @@ return [
|
||||
return $search;
|
||||
}
|
||||
],
|
||||
'computed' => [
|
||||
'methods' => [
|
||||
'searchterm' => function (): ?string {
|
||||
return App::instance()->request()->get('searchterm');
|
||||
}
|
||||
|
@@ -35,7 +35,7 @@ return [
|
||||
}
|
||||
|
||||
// don't allow sorting while search filter is active
|
||||
if (empty($this->query) === false) {
|
||||
if (empty($this->searchterm()) === false) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -99,8 +99,8 @@ return [
|
||||
});
|
||||
|
||||
// search
|
||||
if ($this->search === true && empty($this->searchterm) === false) {
|
||||
$pages = $pages->search($this->searchterm);
|
||||
if ($this->search === true && empty($this->searchterm()) === false) {
|
||||
$pages = $pages->search($this->searchterm());
|
||||
}
|
||||
|
||||
// sort
|
||||
|
Reference in New Issue
Block a user