Merge branch '2.0' into 2.1

Conflicts:
	lib/Cake/View/ThemeView.php
This commit is contained in:
Ceeram 2012-01-26 21:40:18 +01:00
commit 7eda0affe3
8 changed files with 86 additions and 61 deletions
lib/Cake/Model

View file

@ -1543,7 +1543,7 @@ class Model extends Object implements CakeEventListener {
* @param array $validate See $options param in Model::save(). Does not respect 'fieldList' key if passed
* @return boolean See Model::save()
* @see Model::save()
* @link http://book.cakephp.org/2.0/en/models/retrieving-your-data.html#model-read
* @link http://book.cakephp.org/2.0/en/models/saving-your-data.html#model-savefield-string-fieldname-string-fieldvalue-validate-false
*/
public function saveField($name, $value, $validate = false) {
$id = $this->id;