Merge branch 'master' into 2.4

Conflicts:
	lib/Cake/Controller/Component/AuthComponent.php
This commit is contained in:
ADmad 2013-07-14 10:58:55 +05:30
commit d161b21ae1
146 changed files with 207 additions and 920 deletions
lib/Cake/Test/Case/Model

View file

@ -63,7 +63,6 @@ class ModelWriteTest extends BaseModelTest {
/**
* testInsertAnotherHabtmRecordWithSameForeignKey method
*
* @access public
* @return void
*/
public function testInsertAnotherHabtmRecordWithSameForeignKey() {
@ -511,7 +510,6 @@ class ModelWriteTest extends BaseModelTest {
/**
* Tests having multiple counter caches for an associated model
*
* @access public
* @return void
*/
public function testCounterCacheMultipleCaches() {