Datasource: This fixes an issue where the tables for different users override each other.
Datasources: one more change here so that the correct columns are selected and not from the global table namespace.
Merge pull request #712 from daschl/oracle-listsources-fix

Oracle listsources fix
at first set file loaded, than load file.

i had trouble with "Cannot redeclare class DboSource". The Problem is that the file is loaded and may the included file also requires that class. In this case the __load function recalls and reload the same file because the loaded flag isnt set.


try include *\cake\libs\model\datasources\dbo_source.php
try include *\cake\libs\model\datasources\dbo_source.php
finsed include *\cake\libs\model\datasources\dbo_source.php
PHP Fatal error:  Cannot redeclare class DboSource in *\cake\libs\model\datasources\dbo_source.php
Merge pull request #732 from timglabisch/patch-1

Fix issues with circular dependencies.
Fix issue with using contain() and query[contain]

When contain() and query['contain'] = array(...) were used together
the query['contain'] values where not respected.

Fixes #3287

Conflicts:
	cake/libs/model/behaviors/containable.php
Fix cake shell script to run properly on macos.

Fixes #3323
Removed the error control operator from "ocilogon" and "ociplogon" to avoid "white screen" when the OCI8 extension is not enabled.
Merge pull request #1144 from mathop/1.3-dbo_oracle

Removed the error control operator from "ocilogon" and "ociplogon".
Docblock fixes to help apigen
Making sure correct alias is selected for pagination