mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-13 10:15:28 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#1292

Browse Source
This commit is contained in:
Ryan Cramer
2021-03-19 15:14:25 -04:00
parent 0dc408a8dd
commit a475430031
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wire/core/Page.php
View File

@@ -2057,7 +2057,7 @@ class Page extends WireData implements \Countable, WireMatchable {
} else if($userType === 'modified' || strpos($userType, 'modified') === 0) {
$userType = 'modified';
} else {
return new NullPage();
return $this->wire(new NullPage());
}
$property = '_' . $userType . 'User';
@@ -2068,16 +2068,20 @@ class Page extends WireData implements \Countable, WireMatchable {
$key = $userType . '_users_id';
$uid = (int) $this->settings[$key];
if(!$uid) return new NullPage();
if($uid === (int) $this->wire('user')->id) {
if(!$uid) return $this->wire(new NullPage());
$u = $this->wire()->user;
if($u && $uid === $u->id) {
// ok use current user $user
$user = $this->wire('user');
$user = $u;
} else {
// get user
$user = $this->wire('users')->get($uid);
$users = $this->wire()->users;
if($users) $user = $users->get($uid);
}
if(!$user) $user = $this->wire(new NullPage());
$this->$property = $user; // cache to _createdUser or _modifiedUser
return $user;