From 955dc088b9c332d588cb57ad040b88a28b7b8b9a Mon Sep 17 00:00:00 2001 From: Max Lapko Date: Thu, 16 May 2013 10:34:15 +0300 Subject: [PATCH] Change magic methods to getters --- yii/debug/Toolbar.php | 5 +++-- yii/widgets/LinkPager.php | 2 +- yii/widgets/ListPager.php | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/yii/debug/Toolbar.php b/yii/debug/Toolbar.php index 591f0f6..c205277 100644 --- a/yii/debug/Toolbar.php +++ b/yii/debug/Toolbar.php @@ -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', diff --git a/yii/widgets/LinkPager.php b/yii/widgets/LinkPager.php index 1651246..2510579 100644 --- a/yii/widgets/LinkPager.php +++ b/yii/widgets/LinkPager.php @@ -122,7 +122,7 @@ class LinkPager extends Widget { $buttons = array(); - $pageCount = $this->pagination->pageCount; + $pageCount = $this->pagination->getPageCount(); $currentPage = $this->pagination->getPage(); // first page diff --git a/yii/widgets/ListPager.php b/yii/widgets/ListPager.php index a68b624..7b16f7d 100644 --- a/yii/widgets/ListPager.php +++ b/yii/widgets/ListPager.php @@ -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();