adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-09 13:02:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into 2.3

Browse source 
Conflicts:
	lib/Cake/Console/Templates/skel/Config/core.php
This commit is contained in:
Graham Weldon 2012-12-27 22:42:18 +09:00
commit a9293aa385
7 changed files with 33 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Model/Model.php
View file

@ -2660,7 +2660,7 @@ class Model extends Object implements CakeEventListener {
* @param string $type Type of find operation (all / first / count / neighbors / list / threaded)
* @param array $query Option fields (conditions / fields / joins / limit / offset / order / page / group / callbacks)
* @return array Array of records, or Null on failure.
* @link http://book.cakephp.org/2.0/en/models/deleting-data.html#deleteall
* @link http://book.cakephp.org/2.0/en/models/retrieving-your-data.html
*/
public function find($type = 'first', $query = array()) {
$this->findQueryType = $type;