Permalink
Browse files

Merging fixes and enhancements into trunk

Revision: [1841]
Merging changes made in model_php5.php to model_php4.php

Revision: [1840]
Adding fix for PHP 5 when using mysql_connect setting.
Commented out the call to Dbo*::disconnect(). This was closing connections early.
Adding fixe for Ticket #302.
Adding Enhancement for Ticket #300.
Adding fix for Ticket #299
Adding Enhancement for Ticket #298
Adding fix for Ticket #297
Adding Enhancement/Patch from Ticket #296

Revision: [1838]
working on deeper recursive joins

Revision: [1837]
Updating copyright information in all files

Revision: [1836]
Adding fix when setting a field value to 0.
Before it would set this to NULL, which was not expected result.  


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1842 3807eeeb-6ff5-0310-8944-8be069107fe0
  • Loading branch information...
1 parent a74dd6a commit 73830ec0dc62b33d9a9531ea04b167c8aa4c5251 @phpnut phpnut committed Jan 20, 2006
Showing with 543 additions and 450 deletions.
  1. +1 −1 VERSION.txt
  2. +2 −2 app/config/acl.ini.php
  3. +2 −2 app/config/core.php
  4. +9 −6 app/config/database.php.default
  5. +2 −2 app/config/routes.php
  6. +2 −2 app/config/routes.php.default
  7. +2 −2 app/index.php
  8. +5 −4 app/webroot/.htaccess
  9. +2 −2 app/webroot/css.php
  10. +2 −2 app/webroot/index.php
  11. +2 −2 app/webroot/js/vendors.php
  12. +2 −2 cake/app_controller.php
  13. +2 −2 cake/app_model.php
  14. +2 −2 cake/basics.php
  15. +2 −2 cake/bootstrap.php
  16. +2 −2 cake/config/paths.php
  17. +3 −3 cake/config/tags.ini.php
  18. +2 −2 cake/dispatcher.php
  19. +4 −4 cake/docs/COPYING.txt
  20. +1 −1 cake/docs/GOTCHAS.txt
  21. +4 −4 cake/docs/LICENSE.txt
  22. +2 −2 cake/libs/bake.php
  23. +2 −2 cake/libs/cache.php
  24. +2 −2 cake/libs/class_registry.php
  25. +2 −2 cake/libs/controller/component.php
  26. +2 −2 cake/libs/controller/components/acl.php
  27. +2 −2 cake/libs/controller/components/acl_base.php
  28. +2 −2 cake/libs/controller/components/dbacl/db_acl.php
  29. +2 −2 cake/libs/controller/components/dbacl/models/aclnode.php
  30. +2 −2 cake/libs/controller/components/dbacl/models/aco.php
  31. +2 −2 cake/libs/controller/components/dbacl/models/acoaction.php
  32. +2 −2 cake/libs/controller/components/dbacl/models/aro.php
  33. +2 −2 cake/libs/controller/components/dbacl/models/aros_aco.php
  34. +2 −2 cake/libs/controller/components/iniacl/ini_acl.php
  35. +2 −2 cake/libs/controller/components/session.php
  36. +2 −2 cake/libs/controller/controller.php
  37. +2 −2 cake/libs/controller/pages_controller.php
  38. +2 −2 cake/libs/controller/scaffold.php
  39. +2 −2 cake/libs/error.php
  40. +2 −2 cake/libs/file.php
  41. +2 −2 cake/libs/flay.php
  42. +2 −6 cake/libs/folder.php
  43. +2 −2 cake/libs/inflector.php
  44. +2 −4 cake/libs/legacy.php
  45. +2 −2 cake/libs/log.php
  46. +2 −2 cake/libs/model/connection_manager.php
  47. +2 −2 cake/libs/model/datasources/datasource.php
  48. +11 −7 cake/libs/model/datasources/dbo_source.php
  49. +93 −21 cake/libs/model/dbo/dbo_adodb.php
  50. +2 −2 cake/libs/model/dbo/dbo_dbo.php
  51. +2 −2 cake/libs/model/dbo/dbo_generic.php
  52. +4 −4 cake/libs/model/dbo/dbo_mysql.php
  53. +2 −2 cake/libs/model/dbo/dbo_pear.php
  54. +2 −2 cake/libs/model/dbo/dbo_postgres.php
  55. +2 −2 cake/libs/model/dbo/dbo_sqlite.php
  56. +2 −2 cake/libs/model/model.php
  57. +115 −107 cake/libs/model/model_php4.php
  58. +115 −104 cake/libs/model/model_php5.php
  59. +2 −2 cake/libs/neat_array.php
  60. +2 −2 cake/libs/neat_string.php
  61. +2 −2 cake/libs/object.php
  62. +2 −2 cake/libs/router.php
  63. +2 −2 cake/libs/sanitize.php
  64. +2 −2 cake/libs/security.php
  65. +2 −2 cake/libs/session.php
  66. +2 −2 cake/libs/validators.php
  67. +2 −2 cake/libs/view/helper.php
  68. +2 −2 cake/libs/view/helpers/ajax.php
  69. +2 −2 cake/libs/view/helpers/form.php
  70. +2 −2 cake/libs/view/helpers/html.php
  71. +2 −2 cake/libs/view/helpers/javascript.php
  72. +2 −2 cake/libs/view/helpers/number.php
  73. +2 −2 cake/libs/view/helpers/text.php
  74. +2 −2 cake/libs/view/helpers/time.php
  75. +2 −2 cake/libs/view/templates/elements/dump.thtml
  76. +2 −2 cake/libs/view/templates/errors/error404.thtml
  77. +2 −2 cake/libs/view/templates/errors/missing_action.thtml
  78. +2 −2 cake/libs/view/templates/errors/missing_component_class.thtml
  79. +2 −2 cake/libs/view/templates/errors/missing_component_file.thtml
  80. +2 −2 cake/libs/view/templates/errors/missing_connection.thtml
  81. +2 −2 cake/libs/view/templates/errors/missing_controller.thtml
  82. +2 −2 cake/libs/view/templates/errors/missing_helper_class.thtml
  83. +2 −2 cake/libs/view/templates/errors/missing_helper_file.thtml
  84. +2 −2 cake/libs/view/templates/errors/missing_layout.thtml
  85. +2 −2 cake/libs/view/templates/errors/missing_scaffolddb.thtml
  86. +2 −2 cake/libs/view/templates/errors/missing_table.thtml
  87. +2 −2 cake/libs/view/templates/errors/missing_view.thtml
  88. +2 −2 cake/libs/view/templates/errors/private_action.thtml
  89. +2 −2 cake/libs/view/templates/layouts/ajax.thtml
  90. +3 −3 cake/libs/view/templates/layouts/default.thtml
  91. +2 −2 cake/libs/view/templates/layouts/flash.thtml
  92. +2 −2 cake/libs/view/templates/pages/home.thtml
  93. +2 −2 cake/libs/view/templates/scaffolds/edit.thtml
  94. +2 −2 cake/libs/view/templates/scaffolds/list.thtml
  95. +2 −2 cake/libs/view/templates/scaffolds/new.thtml
  96. +2 −2 cake/libs/view/templates/scaffolds/show.thtml
  97. +3 −3 cake/libs/view/view.php
  98. +2 −2 cake/scripts/acl.php
  99. +2 −2 cake/scripts/bake.php
  100. +2 −2 index.php
View
@@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ //
///////////////////////////////////////////////////////////////////////////////////////////////////////////
-0.10.6.1835 RC 2
+0.10.7.1842 RC 2
View
@@ -7,15 +7,15 @@
; * PHP versions 4 and 5
; *
; * CakePHP : Rapid Development Framework <http://www.cakephp.org/>
-; * Copyright (c) 2005, Cake Software Foundation, Inc.
+; * Copyright (c) 2006, Cake Software Foundation, Inc.
; * 1785 E. Sahara Avenue, Suite 490-204
; * Las Vegas, Nevada 89104
; *
; * Licensed under The MIT License
; * Redistributions of files must retain the above copyright notice.
; *
; * @filesource
-; * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+; * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
; * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
; * @package cake
; * @subpackage cake.cake.app.config
View
@@ -9,15 +9,15 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.app.config
@@ -2,22 +2,22 @@
/* SVN FILE: $Id$ */
/**
- * This is core configuration file.
- *
+ * This is core configuration file.
+ *
* Use it to configure core behaviour ofCake.
*
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
- * @filesource
- * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @filesource
+ * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.app.config
@@ -30,7 +30,7 @@
/**
* In this file you set up your database connection details.
- *
+ *
* @package cake
* @subpackage cake.config
*/
@@ -47,6 +47,9 @@
* MySQL set the connect to either mysql_pconnect of mysql_connect
* PostgreSQL set the connect to either pg_pconnect of pg_connect
* SQLite set the connect to sqlite_popen sqlite_open
+ * ADOdb set the connect to one of these
+ * (http://phplens.com/adodb/supported.databases.html) and
+ * append it '|p' for persistent connection. (mssql|p for example, or just mssql for not persistent)
*
* host =>
* the host you connect to the database
View
@@ -11,15 +11,15 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.app.config
@@ -11,15 +11,15 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.app.config
View
@@ -5,15 +5,15 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.app
View
@@ -1,5 +1,6 @@
<IfModule mod_rewrite.c>
- RewriteEngine On
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteRule ^(.*)$ index.php?url=$1 [QSA,L]
-</IfModule>
+ RewriteEngine On
+ RewriteCond %{REQUEST_FILENAME} !-d
+ RewriteCond %{REQUEST_FILENAME} !-f
+ RewriteRule ^(.*)$ index.php?url=$1 [QSA,L]
+</IfModule>
View
@@ -9,15 +9,15 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.app.webroot
View
@@ -9,15 +9,15 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.app.webroot
@@ -10,15 +10,15 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.public.js
View
@@ -10,15 +10,15 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake
View
@@ -10,15 +10,15 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake
View
@@ -9,15 +9,15 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake
View
@@ -9,15 +9,15 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake
View
@@ -9,15 +9,15 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.app.config
View
@@ -9,7 +9,7 @@
; * PHP versions 4 and 5
; *
; * CakePHP : Rapid Development Framework <http://www.cakephp.org/>
-; * Copyright (c) 2005, Cake Software Foundation, Inc.
+; * Copyright (c) 2006, Cake Software Foundation, Inc.
; * 1785 E. Sahara Avenue, Suite 490-204
; * Las Vegas, Nevada 89104
; *
@@ -18,7 +18,7 @@
; *
; * @filesource
; *
-; * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+; * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
; * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
; * @package cake
; * @subpackage cake.cake.app.config
@@ -82,7 +82,7 @@
submit = "<input type="submit" %s/>"
; Tag template for an image tag.
-image =" <img src="%s" %s/>"
+image ="<img src="%s" %s/>"
; Tag template for a table header tag.
tableheader = "<th%s>%s</th>"
View
@@ -10,15 +10,15 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake
View
@@ -1,9 +1,9 @@
The MIT License
-Copyright: (c) 2005, CakePHP Authors/Developers
- Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com>
- Larry E. Masters aka PhpNut <nut@phpnut.com>
- Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+CakePHP : Rapid Development Framework <http://www.cakephp.org/>
+Copyright (c) 2006, Cake Software Foundation, Inc.
+ 1785 E. Sahara Avenue, Suite 490-204
+ Las Vegas, Nevada 89104
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
View
@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////
// +---------------------------------------------------------------------------------------------------+ //
-// + $Id:$
+// + $Id$
// + Last Modified:$
// + Modified By:$
// +---------------------------------------------------------------------------------------------------+ //
View
@@ -1,9 +1,9 @@
The MIT License
-Copyright: (c) 2005, CakePHP Authors/Developers
- Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com>
- Larry E. Masters aka PhpNut <nut@phpnut.com>
- Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+CakePHP : Rapid Development Framework <http://www.cakephp.org/>
+Copyright (c) 2006, Cake Software Foundation, Inc.
+ 1785 E. Sahara Avenue, Suite 490-204
+ Las Vegas, Nevada 89104
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
View
@@ -8,15 +8,15 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.app.webroot
Oops, something went wrong.

0 comments on commit 73830ec

Please sign in to comment.