octicon-mirror(24/)
php/yii2
octicon-rss(16/)
1
0
octicon-repo-forked(16/)Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-10 02:13:17 +08:00
octicon-code(16/) Code octicon-issue-opened(16/) Issues octicon-package(16/) Packages octicon-project(16/) Projects octicon-tag(16/) Releases octicon-book(16/) Wiki octicon-pulse(16/) Activity

Fixes #13961: RBAC Rules: PostgreSQL: PHP Warning "unserialize() expects parameter 1 to be string, resource given" was fixed

Browse Source
This commit is contained in:
octicon-git-branch(16/)
octicon-tag(16/)
Vladimir Guts
2017-04-12 21:48:16 +03:00
committed by Alexander Makarov
gitea-unlock(16/)
parent 510cd3541d
commit d2fb17f444
octicon-diff(16/tw-mr-1) 2 changed files with 6 additions and 1 deletions
gitea-whitespace(16/)
gitea-join(16/)
octicon-kebab-horizontal(16/)
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@@ -63,6 +63,7 @@ Yii Framework 2 Change Log
- Enh #13560: Refactored `\yii\widgets\FragmentCache::getCachedContent()`, added tests (Kolyunya) - Enh #13560: Refactored `\yii\widgets\FragmentCache::getCachedContent()`, added tests (Kolyunya)
- Bug #13901: Fixed passing unused parameter to `formatMessage()` call in `\yii\validators\IpValidator` (Kolyunya) - Bug #13901: Fixed passing unused parameter to `formatMessage()` call in `\yii\validators\IpValidator` (Kolyunya)
- Enh #13945: Removed Courier New from error page fonts list since it looks bad on Linux (samdark) - Enh #13945: Removed Courier New from error page fonts list since it looks bad on Linux (samdark)
- Bug #13961: RBAC Rules: PostgreSQL: PHP Warning "unserialize() expects parameter 1 to be string, resource given" was fixed (vsguts)
2.0.11.2 February 08, 2017 2.0.11.2 February 08, 2017
-------------------------- --------------------------

6
framework/rbac/DbManager.php
View File

@@ -987,7 +987,11 @@ class DbManager extends BaseManager
$query = (new Query)->from($this->ruleTable); $query = (new Query)->from($this->ruleTable);
$this->rules = []; $this->rules = [];
foreach ($query->all($this->db) as $row) { foreach ($query->all($this->db) as $row) {
$this->rules[$row['name']] = unserialize($row['data']); $data = $row['data'];
if (is_resource($data)) {
$data = stream_get_contents($data);
}
$this->rules[$row['name']] = unserialize($data);
} }
$query = (new Query)->from($this->itemChildTable); $query = (new Query)->from($this->itemChildTable);