adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 18:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing deprecated $this->params in Helpers, it got missed somehow.

Browse source 
Removing PaginatorHelper::$convertKeys.  Its just a regular option now.
Added some documentation.
This commit is contained in:
mark_story 2010-12-26 13:01:20 -05:00
parent ee3017599d
commit 83d12ce690
2 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cake/libs/view/helper.php
View file

@ -137,7 +137,6 @@ class Helper extends Object {
*/
public function __construct(View $View, $settings = array()) {
$this->_View = $View;
$this->params = $View->params;
$this->request = $View->request;
if (!empty($this->helpers)) {
$this->_helperMap = ObjectCollection::normalizeObjectArray($this->helpers);

17
cake/libs/view/helpers/paginator.php
View file

@ -68,19 +68,15 @@ class PaginatorHelper extends AppHelper {
* If this key isn't specified Paginator will use plain HTML links.
* - `$options['paramType']` The type of parameters to use when creating links. Valid options are
* 'querystring', 'named', and 'route'. See PaginatorComponent::$settings for more information.
* - `convertKeys` - A list of keys in url arrays that should be converted to querysting params
* if paramType == 'querystring'.
*
* @var array
* @access public
*/
public $options = array();
/**
* A list of keys that will be turned into `$this->options['paramType']` url parameters when links
* are generated
*
* @var array
*/
public $convertKeys = array('page', 'limit', 'sort', 'direction');
public $options = array(
'convertKeys' => array('page', 'limit', 'sort', 'direction')
);
/**
* Constructor for the helper. Sets up the helper that is used for creating 'AJAX' links.
@ -355,6 +351,7 @@ class PaginatorHelper extends AppHelper {
$url = array_merge((array)$options['url'], (array)$url);
unset($options['url']);
}
unset($options['convertKeys']);
$url = $this->url($url, true, $model);
@ -403,7 +400,7 @@ class PaginatorHelper extends AppHelper {
if (!isset($url['?'])) {
$url['?'] = array();
}
foreach ($this->convertKeys as $key) {
foreach ($this->options['convertKeys'] as $key) {
if (isset($url[$key])) {
$url['?'][$key] = $url[$key];
unset($url[$key]);