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/Model/Datasource

View file

@ -415,7 +415,6 @@ class DataSource extends Object {
* Returns the schema name. Override this in subclasses.
*
* @return string schema name
* @access public
*/
public function getSchemaName() {
return null;
@ -425,7 +424,6 @@ class DataSource extends Object {
* Closes a connection. Override in subclasses
*
* @return boolean
* @access public
*/
public function close() {
return $this->connected = false;