Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
ab5d7bd5
Commit
ab5d7bd5
authored
Jan 19, 2014
by
Qiang Xue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #2051: Do not save null data into database when using RBAC
parent
8e8eca36
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
CHANGELOG.md
framework/CHANGELOG.md
+1
-0
DbManager.php
framework/rbac/DbManager.php
+2
-2
No files found.
framework/CHANGELOG.md
View file @
ab5d7bd5
...
@@ -74,6 +74,7 @@ Yii Framework 2 Change Log
...
@@ -74,6 +74,7 @@ Yii Framework 2 Change Log
-
Enh #1973:
`yii message/extract`
is now able to generate
`.po`
files (SergeiKutanov, samdark)
-
Enh #1973:
`yii message/extract`
is now able to generate
`.po`
files (SergeiKutanov, samdark)
-
Enh #1984: ActionFilter will now mark event as handled when action run is aborted (cebe)
-
Enh #1984: ActionFilter will now mark event as handled when action run is aborted (cebe)
-
Enh #2003: Added
`filter`
property to
`ExistValidator`
and
`UniqueValidator`
to support adding additional filtering conditions (qiangxue)
-
Enh #2003: Added
`filter`
property to
`ExistValidator`
and
`UniqueValidator`
to support adding additional filtering conditions (qiangxue)
-
Enh #2051: Do not save null data into database when using RBAC (qiangxue)
-
Enh: Added
`favicon.ico`
and
`robots.txt`
to default application templates (samdark)
-
Enh: Added
`favicon.ico`
and
`robots.txt`
to default application templates (samdark)
-
Enh: Added
`Widget::autoIdPrefix`
to support prefixing automatically generated widget IDs (qiangxue)
-
Enh: Added
`Widget::autoIdPrefix`
to support prefixing automatically generated widget IDs (qiangxue)
-
Enh: Support for file aliases in console command 'message' (omnilight)
-
Enh: Support for file aliases in console command 'message' (omnilight)
...
...
framework/rbac/DbManager.php
View file @
ab5d7bd5
...
@@ -449,7 +449,7 @@ class DbManager extends Manager
...
@@ -449,7 +449,7 @@ class DbManager extends Manager
'type'
=>
$type
,
'type'
=>
$type
,
'description'
=>
$description
,
'description'
=>
$description
,
'biz_rule'
=>
$bizRule
,
'biz_rule'
=>
$bizRule
,
'data'
=>
serialize
(
$data
),
'data'
=>
$data
===
null
?
null
:
serialize
(
$data
),
])
])
->
execute
();
->
execute
();
return
new
Item
([
return
new
Item
([
...
@@ -496,7 +496,7 @@ class DbManager extends Manager
...
@@ -496,7 +496,7 @@ class DbManager extends Manager
->
queryOne
();
->
queryOne
();
if
(
$row
!==
false
)
{
if
(
$row
!==
false
)
{
if
((
$data
=
@
unserialize
(
$row
[
'data'
]))
===
false
)
{
if
(
!
isset
(
$row
[
'data'
])
||
(
$data
=
@
unserialize
(
$row
[
'data'
]))
===
false
)
{
$data
=
null
;
$data
=
null
;
}
}
return
new
Item
([
return
new
Item
([
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment