Skip to content
Permalink
Browse files

Remove deprecated config() calls

  • Loading branch information...
cleptric committed Jul 27, 2017
1 parent d2141c3 commit 02e46854e5ce4757781a7872add12b06f890e020
Showing with 2 additions and 2 deletions.
  1. +1 −1 src/Controller/Component/PaginatorComponent.php
  2. +1 −1 src/Datasource/Paginator.php
@@ -282,7 +282,7 @@ protected function _setPagingParams()
*/
public function config($key = null, $value = null, $merge = true)
{
$return = $this->_paginator->config($key, $value, $merge);
$return = $this->_paginator->setConfig($key, $value, $merge);
if ($return instanceof PaginatorInterface) {
$return = $this;
}
@@ -278,7 +278,7 @@ public function mergeOptions($params, $settings)
$scope = $settings['scope'];
$params = !empty($params[$scope]) ? (array)$params[$scope] : [];
}
$params = array_intersect_key($params, array_flip($this->config('whitelist')));
$params = array_intersect_key($params, array_flip($this->getConfig('whitelist')));
return array_merge($settings, $params);
}

0 comments on commit 02e4685

Please sign in to comment.
You can’t perform that action at this time.