import v2.0.0.0_RC3 | 2012-07-01
https://github.com/lucanos/CommunityID -> http://www.itadmins.net/archives/357
This commit is contained in:
@ -16,7 +16,7 @@
|
||||
* @package Zend_View
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: PaginationControl.php 16222 2009-06-21 19:55:20Z thomas $
|
||||
* @version $Id: PaginationControl.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -29,7 +29,7 @@ class Zend_View_Helper_PaginationControl
|
||||
{
|
||||
/**
|
||||
* View instance
|
||||
*
|
||||
*
|
||||
* @var Zend_View_Instance
|
||||
*/
|
||||
public $view = null;
|
||||
@ -62,7 +62,7 @@ class Zend_View_Helper_PaginationControl
|
||||
{
|
||||
self::$_defaultViewPartial = $partial;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the default view partial
|
||||
*
|
||||
@ -75,7 +75,7 @@ class Zend_View_Helper_PaginationControl
|
||||
|
||||
/**
|
||||
* Render the provided pages. This checks if $view->paginator is set and,
|
||||
* if so, uses that. Also, if no scrolling style or partial are specified,
|
||||
* if so, uses that. Also, if no scrolling style or partial are specified,
|
||||
* the defaults will be used (if set).
|
||||
*
|
||||
* @param Zend_Paginator (Optional) $paginator
|
||||
@ -99,7 +99,7 @@ class Zend_View_Helper_PaginationControl
|
||||
throw new Zend_View_Exception('No paginator instance provided or incorrect type');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ($partial === null) {
|
||||
if (self::$_defaultViewPartial === null) {
|
||||
/**
|
||||
@ -109,12 +109,12 @@ class Zend_View_Helper_PaginationControl
|
||||
|
||||
throw new Zend_View_Exception('No view partial provided and no default set');
|
||||
}
|
||||
|
||||
|
||||
$partial = self::$_defaultViewPartial;
|
||||
}
|
||||
|
||||
$pages = get_object_vars($paginator->getPages($scrollingStyle));
|
||||
|
||||
|
||||
if ($params !== null) {
|
||||
$pages = array_merge($pages, (array) $params);
|
||||
}
|
||||
@ -132,10 +132,10 @@ class Zend_View_Helper_PaginationControl
|
||||
if ($partial[1] !== null) {
|
||||
return $this->view->partial($partial[0], $partial[1], $pages);
|
||||
}
|
||||
|
||||
|
||||
$partial = $partial[0];
|
||||
}
|
||||
|
||||
|
||||
return $this->view->partial($partial, $pages);
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user