Commit graph

1214 commits

Author SHA1 Message Date
phpnut
57023720e6 Adding form security enhancements.
Forcing checking of Session form token if security component is used.
Enhancement will not allow a form to be submitted if the fields in the form created with the FormHelper do not match the fields in the submitted form.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4968 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-01 08:56:02 +00:00
phpnut
767853afae Adding fix for failing model validation tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4967 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-01 03:52:28 +00:00
phpnut
f108267541 Correcting subpackage tag
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4964 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-01 02:44:00 +00:00
phpnut
8f929c6ff8 Fixing paths to correctly load acl models.
Updating test for acl

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4961 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-01 02:30:26 +00:00
phpnut
166132ca10 Moving all acl related models to model/db_acl.php.
Removing components/models directories
Changing the ACL_FILENAME setting in core.php

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4960 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-01 01:49:51 +00:00
phpnut
7111d292fd Moving AclBase class to the acl.php file.
Removing components/iniacl directory.
Removing acl_base.php file.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4959 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-01 01:23:21 +00:00
phpnut
8780af05a3 Restructuring locations of acl related classes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4958 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-01 01:16:27 +00:00
phpnut
6d439f0f44 Adding fix for #2510, Use shorter names for attached files in EmailComponent
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4957 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-01 00:44:19 +00:00
phpnut
0fc3cd00d3 Adding fix for #2505
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4956 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-01 00:19:42 +00:00
phpnut
2dd02aafba Fixing overriding of default messages
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4949 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-30 12:18:09 +00:00
phpnut
30a5f0384e Adding overriding error messages when multiple rules
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4948 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-30 12:10:57 +00:00
phpnut
d029a776b7 Adding Xcache support http://trac.lighttpd.net/xcache/
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4947 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-30 11:31:35 +00:00
phpnut
6a5f623240 Adding fix for failing ajax tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4946 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-30 11:12:11 +00:00
phpnut
5b70a957bb Adding fix when mysql_connect is set as a connection in the database config and persistent key is not set in the config, the default for persistent is true and this would override the settings in the database config
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4945 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-30 10:56:22 +00:00
phpnut
fbb102445b Fixing assigned by reference on php 4
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4942 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-30 09:42:39 +00:00
phpnut
5d4e0e6a62 Fixing assigned by reference on php 4, removing reference in Cache::engine()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4941 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-30 09:32:51 +00:00
phpnut
237504541e Making changes to cache classes and rearranging code to use new cache
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4940 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-30 09:12:49 +00:00
phpnut
b6fb4d80d0 Adding return false when Memcache is set as the cache engine and the memcache extension is not installed.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4939 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-30 07:52:17 +00:00
phpnut
18f7ecd725 Renaming files _engine was redundant
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4937 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-30 07:44:29 +00:00
phpnut
bca9595101 Refactoring new cache classes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4936 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-30 07:38:47 +00:00
nate
fad2dc55ad Fixing Model::invalidFields to account for '0' in empty checks
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4935 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-30 06:26:59 +00:00
nate
d3c3d34dce Changing 'allowEmpty' for model validation, adding 'required' and enabling multiple rules per field
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4934 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-30 06:24:33 +00:00
phpnut
c62c550e3f Adding initial implementation of extended caching capabilities
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4933 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-30 06:01:54 +00:00
phpnut
5c2097f7d3 Adding fix for Controller::modelClass; name when var $uses; is not the same as the Controllers singular name.
This is now set to the first value of the key $uses[0] if multiple models are added to var $uses;

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4932 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-30 03:43:48 +00:00
phpnut
d1162169ba Adding fix for #2505, fixes Recursive delete in self joined models
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4931 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-30 02:46:51 +00:00
phpnut
d1e2b89c8b Fixing bug with first level validation not showing
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4929 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 20:51:59 +00:00
gwoo
3bca724bc3 fixing theme view layout and element paths #2388
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4928 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 17:51:38 +00:00
phpnut
d861587960 Adding fix for #2452 (patch from #2476).
Added tests for ticket #2452

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4927 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 11:10:11 +00:00
phpnut
2baa585437 Added fix for #2453, fixes HtmlHelper link escape title as string
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4926 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 10:25:58 +00:00
nate
7f4201280e Fixing last commit
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4923 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 09:14:09 +00:00
nate
f28e6d5b77 Removing fields() method from DboDbo2 (Ticket #2444)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4922 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 09:11:35 +00:00
phpnut
815b159ab3 Adding fix for #2478 corrects issue on php 4
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4921 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 08:56:10 +00:00
phpnut
027f7838b5 Adding fix for #2435. Fixes issues with custom inflection rules not being used before the default rules
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4919 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 08:41:46 +00:00
phpnut
87cfb1766d Adding fix for #2416 fixes Invalid query when using boolean conditions in PostgreSQL
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4916 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 07:02:25 +00:00
phpnut
1fa4e18487 Added fix for #2450
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4915 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 06:11:32 +00:00
phpnut
f1c03fe608 Adding fix for #2500 fixes adding of table.id when not using associated models and only wanting specific fields returned
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4914 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 06:06:15 +00:00
phpnut
5757d6b7e9 Adding fixes for test added in [4911] and [4912]
Fixed #2414 fixes findBy doesn't escape WHERE condition

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4913 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 05:37:39 +00:00
phpnut
91d4b05e9b Adding fix for #2419 fixes issue with long lines in email messages breaking links
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4910 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 04:16:43 +00:00
phpnut
0ddac86f58 Adding fix for #2466 fixes missed Router::__mapped reinit in Router::url()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4909 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 03:46:58 +00:00
phpnut
7cdb495068 Adding fix for #2428 fixes View::renderElement() behavior with multiple view paths
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4908 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 03:33:37 +00:00
phpnut
aee7405863 Adding additional fix for #2481
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4905 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 03:05:08 +00:00
phpnut
e91a15e4e2 Adding fix for #2481 fixes Form::label() $tagName does not run through domId()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4904 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 02:58:01 +00:00
phpnut
527a2e6bcd Adding enhancement from #2483.adds scaffold index view field's label
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4903 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 02:52:17 +00:00
phpnut
74ca09d759 Adding fix for #2491 fixes bad scaffold templates paths
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4901 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 02:03:43 +00:00
phpnut
698b221943 Adding fix for #2488 fixes Set::extract failed on assoc array if key starts with numeric
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4900 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 01:47:26 +00:00
phpnut
c91965dc89 Adding fix for #2371, fixes HtmlHelper submit() method doesn't allow HTML entities in caption
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4895 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-28 23:52:19 +00:00
dho
efd8df1771 Applying fix from ticket #2485, adding test for it
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4894 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-28 09:20:35 +00:00
dho
da0dacb013 Applying patch from ticket #2496, adding test for it
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4893 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-28 08:57:34 +00:00
phpnut
9b8f81cc82 Removing $fieldset = null; in FormHelper::inputs()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4890 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-27 20:19:27 +00:00
phpnut
30498981a7 Adding fix for #2473
Fixed undefined variable notice in Form::inputs()

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4889 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-27 20:16:38 +00:00
phpnut
1d64691014 Adding fixes from phishy.
Added fixed for #2492

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4887 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-27 06:43:40 +00:00
dho
c529d363a8 Adding patch and test for ticket #2369
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4881 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-25 07:28:20 +00:00
phpnut
0d69e3a085 Adding initial implementation of I18n database translation support
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4880 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-25 00:24:19 +00:00
phpnut
575dafe60a Fixing error when using AuthComponent and DEBUG < 1
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4879 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-24 00:26:10 +00:00
dho
35c7807cc3 Case-insensitive matching when using array of phrases in TextHelper::highlight
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4878 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-21 16:55:09 +00:00
nate
bb8c52dac0 Fixing display of core error messages
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4877 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-18 16:39:11 +00:00
nate
3ba273b16d Adding URL fragment (hash) support in Router::url() (Ticket #2432)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4869 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-17 07:51:01 +00:00
nate
11c5e916b8 Adding undefined variable fix for PaginatorHelper::sortDir() (Ticket #2440)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4868 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-17 07:03:20 +00:00
nate
e5b0f2e3fa Moving Router::__filter() to Set::filter()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4867 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-17 07:00:26 +00:00
dho
9a865176aa Removing invalid character
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4866 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-17 06:48:16 +00:00
nate
5461eec22d Adding fix for <> condition in DboSource (Ticket #2101)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4865 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-17 05:17:06 +00:00
gwoo
f4c9be8be2 working on form helper, added a submit button to form end if you pass true, added fieldset options to inputs
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4862 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-17 02:06:15 +00:00
nate
86d32e4313 Adding fix for misquoted SQL functions (Ticket #2199)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4861 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-16 21:49:28 +00:00
nate
c9b2da1380 Adding field map to convert aliased column names in MSSQL queries
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4859 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-14 23:34:08 +00:00
dho
ee403daf5d Fixing problem with highlighting multiple phrases (ticket #2418)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4857 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-13 14:27:59 +00:00
dho
c9d4fa6451 Applying patch from ticket #2417
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4856 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-13 11:56:03 +00:00
phpnut
94704a2518 Adding patch from Ticket #2374
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4851 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-12 07:46:29 +00:00
phpnut
8170b1f89f Correcting [4849], would attempt to load non existent model is var $uses was not set
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4850 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-12 07:38:25 +00:00
phpnut
e6f519a0a8 Adding fix for Ticket #2349
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4849 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-12 07:29:45 +00:00
phpnut
a2ba6d7715 Adding fix for Ticket #2392
Added tests for this fix.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4848 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-12 07:17:39 +00:00
nate
4e8a803e81 Fixing SQL error in AuthComponent::identify() when username is empty (Ticket #2402)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4847 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-12 02:32:16 +00:00
nate
b0307904ae Fixing (moving) session string warning (Ticket #2377) and adding automatic logging code
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4846 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-12 00:34:16 +00:00
phpnut
385e0c02ba Adding fix for Ticket #2380
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4841 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-11 21:20:10 +00:00
phpnut
b752463592 Adding fix for Ticket #2391
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4840 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-11 20:49:41 +00:00
phpnut
4f78065c14 Adding fix for Ticket #2387
Fixed issue in view with $session->valid() always returning false.


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4839 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-11 20:47:17 +00:00
nate
8df2d428ff Fixing JavascriptHelper::object() bug with numeric indexes, as reported on the mailing list
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4838 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-11 18:02:10 +00:00
nate
3a828d2338 Throwing Missing Model error for missing associated classes, per gwoo
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4837 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-11 18:01:24 +00:00
phpnut
f1678686a4 Adding fix for Ticket #2326
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4835 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-11 15:20:37 +00:00
nate
aed74550fb Removing inline comments and fixing error in parseURI; also fixes Ticket #2382
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4834 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-10 22:56:07 +00:00
nate
0c43266ba7 Adding user check fix for AuthComponent::isAuthorized(), and removing comments from Model test (Ticket #2381)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4833 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-10 16:48:45 +00:00
phpnut
30ea0fb69b Fixed typo in function name strpos replaces strrpos
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4832 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 22:41:17 +00:00
phpnut
8ed1b69b3f Refactoring association joins, Fixes the issue with adding the Model.id if it is not already added.
Adding fix for string based fields.


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4831 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 21:30:55 +00:00
nate
d416fbe4ed Removing name() method from DBO drivers (Ticket #2372)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4830 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 19:54:07 +00:00
phpnut
dcf64033ed Adding fix for undefined index
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4827 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 09:40:56 +00:00
phpnut
00be91c954 Adding first implementation of hasMany associations using one select statement.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4826 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 08:54:25 +00:00
phpnut
cff6ea0ee8 Removing some duplicate code
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4825 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 04:05:22 +00:00
phpnut
95e2782d72 Initial work on using one select statement for hasMany associations
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4824 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 04:00:04 +00:00
phpnut
9a6d54b400 Adding enhancement from Ticket #2366
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4823 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-08 23:30:31 +00:00
phpnut
3ec4ecd127 Adding fix for test in [4816].
This fixes hasOne association conditions

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4818 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-07 20:12:06 +00:00
phpnut
20e41074c9 Adding fix for Ticket #2364
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4814 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-07 06:44:18 +00:00
phpnut
d0c8cde9ab Adding fixes for test in [4811] fixes Ticket #1100
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4812 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-07 06:29:46 +00:00
phpnut
784ee985b5 Adding fix for Ticket #2363
Removed use of:
mysql_insert_id($this->connection);
mysqli_insert_id($this->connection);

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4810 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-07 01:42:12 +00:00
phpnut
980e713df7 Adding fix for Ticket #2360
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4808 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-06 19:05:06 +00:00
phpnut
aaa2e3cf21 Refactoring duplicate code into one method
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4802 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-06 12:19:23 +00:00
phpnut
d5fa0a961b Adding fixes for Ticket #2357, Ticket #2358
Added tests from Ticket #2357, Ticket #2358
Fixed failing DboSourceTest:
source:/branches/1.2.x.x/cake/tests/cases/libs/model/datasources/dbo_source.test.php@4778#L1080


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4801 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-06 11:15:45 +00:00
phpnut
924a235ec3 Removing comments from Set::merge()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4796 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 21:29:00 +00:00
phpnut
69da631d61 Adding fix for Ticket #2353
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4795 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 21:20:08 +00:00
phpnut
135ebe8994 Merging changes from 1.2.x.x Set class to 1.1.x.x branch
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4792 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 20:09:32 +00:00
phpnut
eae615527d Fixing last commit, had removed the ! prior to committing
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4789 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 19:04:07 +00:00
phpnut
10bb0f303a Adding fix for duplicate conditions being merged into the final query on self associations
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4788 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 19:00:15 +00:00