Skip to content

Commit

Permalink
Merge branch 'release/1.7.26.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
rhukster committed Jan 4, 2022
2 parents ea39587 + d541808 commit 92824f4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# v1.7.26.1
## 01/04/2022

3. [](#bugfix)
* Fixed `UserObject::getAccess()` after cloning the object

# v1.7.26
## 01/03/2022

Expand Down
2 changes: 1 addition & 1 deletion system/defines.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

// Some standard defines
define('GRAV', true);
define('GRAV_VERSION', '1.7.26');
define('GRAV_VERSION', '1.7.26.1');
define('GRAV_SCHEMA', '1.7.0_2020-11-20_1');
define('GRAV_TESTING', false);

Expand Down
4 changes: 1 addition & 3 deletions system/src/Grav/Common/Flex/Types/Users/UserObject.php
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,7 @@ protected function getGroups()
protected function getAccess(): Access
{
if (null === $this->_access) {
$this->getProperty('access');
$this->_access = new Access($this->getProperty('access'));
}

return $this->_access;
Expand All @@ -955,8 +955,6 @@ protected function offsetLoad_access($value): array
$value = new Access($value);
}

$this->_access = $value;

return $value->jsonSerialize();
}

Expand Down

0 comments on commit 92824f4

Please sign in to comment.