Merge branch '2.3' into type-checks

Conflicts:
	lib/Cake/Error/ExceptionRenderer.php
	lib/Cake/Routing/Dispatcher.php
This commit is contained in:
dogmatic69 2012-10-24 19:03:44 +01:00
commit 641ba9f3e6
76 changed files with 1292 additions and 581 deletions

View file

@ -533,7 +533,7 @@ class Set {
*
* @param array $data Array from where to extract
* @param string|array $path As an array, or as a dot-separated string.
* @return array Extracted data
* @return array|null Extracted data or null when $data or $path are empty.
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/set.html#Set::classicExtract
*/
public static function classicExtract($data, $path = null) {