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
3b05e715
Commit
3b05e715
authored
Oct 28, 2013
by
Carsten Brandt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ensure parameter types in baselistview message
fixes #1072
parent
c62e0cbb
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ActiveDataProvider.php
framework/yii/data/ActiveDataProvider.php
+1
-1
BaseListView.php
framework/yii/widgets/BaseListView.php
+1
-1
No files found.
framework/yii/data/ActiveDataProvider.php
View file @
3b05e715
...
@@ -158,7 +158,7 @@ class ActiveDataProvider extends BaseDataProvider
...
@@ -158,7 +158,7 @@ class ActiveDataProvider extends BaseDataProvider
throw
new
InvalidConfigException
(
'The "query" property must be an instance of Query or its subclass.'
);
throw
new
InvalidConfigException
(
'The "query" property must be an instance of Query or its subclass.'
);
}
}
$query
=
clone
$this
->
query
;
$query
=
clone
$this
->
query
;
return
$query
->
limit
(
-
1
)
->
offset
(
-
1
)
->
count
(
'*'
,
$this
->
db
);
return
(
int
)
$query
->
limit
(
-
1
)
->
offset
(
-
1
)
->
count
(
'*'
,
$this
->
db
);
}
}
/**
/**
...
...
framework/yii/widgets/BaseListView.php
View file @
3b05e715
...
@@ -139,7 +139,7 @@ abstract class BaseListView extends Widget
...
@@ -139,7 +139,7 @@ abstract class BaseListView extends Widget
$pageCount
=
$pagination
->
pageCount
;
$pageCount
=
$pagination
->
pageCount
;
if
((
$summaryContent
=
$this
->
summary
)
===
null
)
{
if
((
$summaryContent
=
$this
->
summary
)
===
null
)
{
$summaryContent
=
'<div class="summary">'
$summaryContent
=
'<div class="summary">'
.
Yii
::
t
(
'yii'
,
'Showing <b>{totalCount, plural, =0{0} other{{begin
}-{end}}}</b> of <b>{totalCount
}</b> {totalCount, plural, one{item} other{items}}.'
)
.
Yii
::
t
(
'yii'
,
'Showing <b>{totalCount, plural, =0{0} other{{begin
, number, integer}-{end, number, integer}}}</b> of <b>{totalCount, number, integer
}</b> {totalCount, plural, one{item} other{items}}.'
)
.
'</div>'
;
.
'</div>'
;
}
}
}
else
{
}
else
{
...
...
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