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
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Rotua Panjaitan
yii2
Commits
e3ca5a81
Commit
e3ca5a81
authored
Sep 05, 2014
by
Qiang Xue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reverted/fixed some incorrect changes.
parent
85926014
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
ViewRenderer.php
extensions/smarty/ViewRenderer.php
+1
-1
ArrayableTrait.php
framework/base/ArrayableTrait.php
+3
-2
HelpController.php
framework/console/controllers/HelpController.php
+2
-2
No files found.
extensions/smarty/ViewRenderer.php
View file @
e3ca5a81
...
@@ -268,6 +268,6 @@ class ViewRenderer extends BaseViewRenderer
...
@@ -268,6 +268,6 @@ class ViewRenderer extends BaseViewRenderer
public
function
aliasHandler
(
$type
,
$name
,
&
$content
,
&
$modified
,
Smarty
$smarty
)
public
function
aliasHandler
(
$type
,
$name
,
&
$content
,
&
$modified
,
Smarty
$smarty
)
{
{
$file
=
Yii
::
getAlias
(
$name
);
$file
=
Yii
::
getAlias
(
$name
);
return
$file
!==
false
&&
is_file
(
$file
)
?
$file
:
false
;
return
is_file
(
$file
)
?
$file
:
false
;
}
}
}
}
framework/base/ArrayableTrait.php
View file @
e3ca5a81
...
@@ -63,14 +63,15 @@ trait ArrayableTrait
...
@@ -63,14 +63,15 @@ trait ArrayableTrait
* information. For example, depending on the privilege of the current application user,
* information. For example, depending on the privilege of the current application user,
* you may return different sets of visible fields or filter out some fields.
* you may return different sets of visible fields or filter out some fields.
*
*
* The default implementation of this method returns the public object member variables.
* The default implementation of this method returns the public object member variables
indexed by themselves
.
*
*
* @return array the list of field names or field definitions.
* @return array the list of field names or field definitions.
* @see toArray()
* @see toArray()
*/
*/
public
function
fields
()
public
function
fields
()
{
{
return
array_keys
(
Yii
::
getObjectVars
(
$this
));
$fields
=
array_keys
(
Yii
::
getObjectVars
(
$this
));
return
array_combine
(
$fields
,
$fields
);
}
}
/**
/**
...
...
framework/console/controllers/HelpController.php
View file @
e3ca5a81
...
@@ -329,12 +329,12 @@ class HelpController extends Controller
...
@@ -329,12 +329,12 @@ class HelpController extends Controller
// show as integer to avoid confusion
// show as integer to avoid confusion
$defaultValue
=
(
int
)
$defaultValue
;
$defaultValue
=
(
int
)
$defaultValue
;
}
}
if
(
$type
===
'boolean'
)
{
if
(
strncmp
(
$type
,
'bool'
,
4
)
===
0
)
{
$type
=
'boolean, 0 or 1'
;
$type
=
'boolean, 0 or 1'
;
}
}
$doc
=
"
$type
(defaults to "
.
var_export
(
$defaultValue
,
true
)
.
")"
;
$doc
=
"
$type
(defaults to "
.
var_export
(
$defaultValue
,
true
)
.
")"
;
}
elseif
(
trim
(
$type
)
!==
''
)
{
}
elseif
(
trim
(
$type
)
!==
''
)
{
if
(
$type
===
'boolean'
)
{
if
(
strncmp
(
$type
,
'bool'
,
4
)
===
0
)
{
$type
=
'boolean, 0 or 1'
;
$type
=
'boolean, 0 or 1'
;
}
}
$doc
=
$type
;
$doc
=
$type
;
...
...
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