php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-04 14:46:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #293 from maxlapko/master

Browse Source 
Change magic methods to getters
This commit is contained in:
Qiang Xue
2013-05-16 05:07:19 -07:00
parent 595ff8e8ea 955dc088b9
commit 71c60b6339
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
yii/debug/Toolbar.php
View File

@ -26,8 +26,9 @@ class Toolbar extends Widget
$url = Yii::$app->getUrlManager()->createUrl($this->debugAction, array(
'tag' => Yii::getLogger()->tag,
));
$this->view->registerJs("yii.debug.load('$id', '$url');");
$this->view->registerAssetBundle('yii/debug');
$view = $this->getView();
$view->registerJs("yii.debug.load('$id', '$url');");
$view->registerAssetBundle('yii/debug');
echo Html::tag('div', '', array(
'id' => $id,
'style' => 'display: none',

2
yii/widgets/LinkPager.php
View File

@ -122,7 +122,7 @@ class LinkPager extends Widget
{
$buttons = array();
$pageCount = $this->pagination->pageCount;
$pageCount = $this->pagination->getPageCount();
$currentPage = $this->pagination->getPage();
// first page

2
yii/widgets/ListPager.php
View File

@ -63,7 +63,7 @@ class ListPager extends Widget
*/
public function run()
{
$pageCount = $this->pagination->pageCount;
$pageCount = $this->pagination->getPageCount();
$currentPage = $this->pagination->getPage();
$pages = array();