Browse Source

Merge pull request #293 from maxlapko/master

Change magic methods to getters
tags/2.0.0-beta
Qiang Xue 12 years ago
parent
commit
71c60b6339
  1. 5
      yii/debug/Toolbar.php
  2. 2
      yii/widgets/LinkPager.php
  3. 2
      yii/widgets/ListPager.php

5
yii/debug/Toolbar.php

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

2
yii/widgets/LinkPager.php

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

2
yii/widgets/ListPager.php

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

Loading…
Cancel
Save