Merge pull request #3224 from dereuromark/master-deprecations

correct deprecation notices
This commit is contained in:
Mark Story 2014-04-04 14:04:53 -04:00
commit c92769c980
2 changed files with 1 additions and 1 deletions

View file

@ -1075,7 +1075,6 @@ class Controller extends Object implements CakeEventListener {
* @param array $whitelist List of allowed options for paging
* @return array Model query results
* @link http://book.cakephp.org/2.0/en/controllers.html#Controller::paginate
* @deprecated Will be removed in 3.0. Use PaginatorComponent instead.
*/
public function paginate($object = null, $scope = array(), $whitelist = array()) {
return $this->Components->load('Paginator', $this->paginate)->paginate($object, $scope, $whitelist);

View file

@ -23,6 +23,7 @@ App::uses('Hash', 'Utility');
* Class used for manipulation of arrays.
*
* @package Cake.Utility
* @deprecated Will be removed in 3.0. Use Hash instead.
*/
class Set {