adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.7

Browse source
This commit is contained in:
mark_story 2015-03-14 22:08:53 -04:00
commit 8cadb553d7
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Controller/Scaffold.php
View file

@ -399,7 +399,7 @@ class Scaffold {
}
} else {
throw new MissingActionException(array(
'controller' => $this->controller->name,
'controller' => get_class($this->controller),
'action' => $request->action
));
}

2
lib/Cake/Core/App.php
View file

@ -259,7 +259,7 @@ class App {
*
* Usage:
*
* `App::build(array(Model' => array('/a/full/path/to/models/'))); will setup a new search path for the Model package`
* `App::build(array('Model' => array('/a/full/path/to/models/'))); will setup a new search path for the Model package`
*
* `App::build(array('Model' => array('/path/to/models/')), App::RESET); will setup the path as the only valid path for searching models`
*

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

@ -2652,7 +2652,7 @@ class Model extends Object implements CakeEventListener {
* Fields are treated as SQL snippets, to insert literal values manually escape your data.
* @param mixed $conditions Conditions to match, true for all records
* @return bool True on success, false on failure
* @link http://book.cakephp.org/2.0/en/models/saving-your-data.html#model-updateall-array-fields-array-conditions
* @link http://book.cakephp.org/2.0/en/models/saving-your-data.html#model-updateall-array-fields-mixed-conditions
*/
public function updateAll($fields, $conditions = true) {
return $this->getDataSource()->update($this, $fields, null, $conditions);