Merge branch 'master' into 2.7

cakephp · Mar 15, 2015 · 8cadb55 · 8cadb55
2 parents f2dd8ea + 8e735c2
commit 8cadb55
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/Cake/Controller/Scaffold.php b/lib/Cake/Controller/Scaffold.php
@@ -399,7 +399,7 @@ protected function _scaffold(CakeRequest $request) {
 				}
 			} else {
 				throw new MissingActionException(array(
-					'controller' => $this->controller->name,
+					'controller' => get_class($this->controller),
 					'action' => $request->action
 				));
 			}

diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php
@@ -259,7 +259,7 @@ public static function paths() {
  *
  * 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`
  *

diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php
@@ -2652,7 +2652,7 @@ public function validateAssociated(&$data, $options = array()) {
  *    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);