Commit graph

3226 commits

Author SHA1 Message Date
gwoo
bc359259a2 Merge branch '1.2' into 1.3 2009-07-02 09:27:00 -07:00
jperras
c30dd48e2a Updating doc block for Set::combine first parameter - may accept an object as first param, in addition to arrays.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8210 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-01 22:25:22 +00:00
mark_story
975e4452d2 Fixing Xml parsing where multiple child elements of the same name, with no value are collapsed causing data errors when Xml object was converted to an array. Test cases from 'burzum' added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8209 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-01 18:58:05 +00:00
mark_story
ff5d9ed6e0 Fixing issues created in [8205] where allowedActions check was done incorrectly. Fixes #6482
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8208 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-01 03:56:16 +00:00
gwoo
8f801a975d Merge branch '1.3-configure' into 1.3 2009-06-30 20:04:25 -07:00
gwoo
58b5c0d77d cleaning up some ;; 2009-06-30 19:56:15 -07:00
mark_story
fd7cf5e5e6 Adding test cases for boolean and boolean-ish values. Fixes false being converted to '' when using Xml::toString().
Fixes #6478

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8206 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-30 01:14:20 +00:00
mark_story
8c7883fe3e Fixing camel cased methods in checks for allowedActions in AuthComponent under PHP5. Normalizes to lowercase method name. Fixes #6142
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8205 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-30 00:25:09 +00:00
mark_story
6a34c9ef31 Fixing Model::saveAll() PHP4 compatibility. Minor API change in __save(). __save() no longer takes a model instance as the first parameter. Because of Model implementation details in PHP4 this caused broken references. Fixes #6389, #6223
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8204 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-27 15:25:07 +00:00
gwoo
13550a140a fixing require cake_session in session component 2009-06-24 15:05:08 -07:00
mark_story
fd818bc493 Applying patch from 'mulleto'. Fixes plugin view file location with CamelCase plugin names. Test cases added.
Fixes #6334

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8202 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-24 22:02:00 +00:00
mark_story
16eb51e91c Adding ControllerMergeVarsTestCase to more extensively test merging of vars in Controller::__mergeVars.
Fixing issue where components declared in AppController would get doubled settings if no components were declared in subclasses.
Fixes #6459

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8201 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-24 18:09:14 +00:00
mark_story
1ea5f94c29 Updating JavascriptHelper::escapeString to properly encode utf8 characters as per the JSON spec.
Test cases added, with comparisons to json_encode()
Fixes #6400

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8198 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-17 01:59:41 +00:00
gwoo
88e0cfa2f8 fixes #6427, default datasource not loaded when ds is specified
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8197 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-16 21:35:21 +00:00
gwoo
9caae67be1 removing delete from cache write refs #5206
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8195 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-16 20:14:50 +00:00
gwoo
9b4e08e93b fixing error in import map when cache is empty 2009-06-14 10:28:30 -07:00
gwoo
f9339e3c81 simplified App::path(). Changed App::build() to handle all paths.
tests passing.
2009-06-11 09:13:16 -07:00
jperras
d335fefbee Adding a 'client' option to EmailComponent:: for specifying the host to be used in the SMTP HELO request; defaults to env('HTTP_HOST'). Fixes #6264.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8194 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-11 03:07:38 +00:00
gwoo
c3643767bf some more updates to path handling 2009-06-10 16:13:39 -07:00
gwoo
e54dbd430f fixes #6419, redirect with cached view page
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8193 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-10 17:11:17 +00:00
gwoo
24d78dd671 moving path configuration to App class 2009-06-07 15:24:10 -07:00
DarkAngelBGE
d9489b942b Removing duplicate START TRANSACTION sql execution in mysqli environment, fixes #6422
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8191 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-06 15:41:33 +00:00
mark_story
2c1b7fc24e Adding nullish value handling for date, datetime, and timestamp column types to DboPostgres. Empty string values now return instead of "". Fixes #6386
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8190 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-05 02:43:08 +00:00
DarkAngelBGE
4a076b3e5f Small return-home-early refactoring for the File class
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8189 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-04 21:29:26 +00:00
gwoo
0ea02c5a94 Merge branch 'master' into 1.3 2009-06-03 10:00:56 -07:00
mark_story
7401b0c70f Updating Session path handling to fix cases when path = ''.
Test cases added.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8186 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-03 16:22:00 +00:00
gwoo
303bc0fc89 fixing up some tests. pretty much all greens for me. 2009-06-02 17:21:15 -07:00
gwoo
5f2ee8fc44 renaming session to cake_session 2009-06-02 14:52:30 -07:00
gwoo
5a45c15d9d merging 1.3-session 2009-06-02 14:52:14 -07:00
gwoo
6f21c18366 Merge branch '1.3-lib_renames' into 1.3 2009-06-02 10:17:02 -07:00
gwoo
fdd63d4e8e Merge branch 'master' into 1.3 2009-06-02 10:12:14 -07:00
jperras
d2b4995e43 Updating Model::deconstruct to handle db expressions correctly. Fixes #6372; thanks to mattcurry for the patch.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8185 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-02 03:23:15 +00:00
mark_story
a9bbae31ee Fixing primary key column length in DboSqlite. UUID primary keys now return defined length.
Test cases added for describe()
Fixes #6412

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8184 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-02 03:03:51 +00:00
gwoo
2842fe7021 fixes #6401, Session path on IIS
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8183 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-01 16:52:05 +00:00
mark_story
9aa64ef564 Ensuring that 'ext' param added by RequestHandler does not end up as a queryString parameter in Auth.redirect.
Adding test case.
Fixes #6211

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8182 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-01 00:01:58 +00:00
mark_story
f498ba0a87 Adding german error string to dbo_mssql::lastError() Fixes #6352
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8180 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-29 02:59:30 +00:00
mark_story
f0752feeec Adding patch from 'burzum'. Fixes ambiguous field sql error when joining two trees with a defined scope.
Test cases and fixtures added.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8178 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-26 17:17:57 +00:00
mark_story
1910e5482b Updating doc block for HtmlHelper::css(). Fixes #6059
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8175 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-22 01:25:13 +00:00
mark_story
41f32d8cee Updating doc block for Model::beforeDelete(). Fixes #6219
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8174 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-22 01:20:47 +00:00
jperras
4f2d65943f Fixing form helper checkbox hidden input generation for disabled fields. Thanks to 'trevorsg' for the patch & test case.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8173 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-14 03:26:53 +00:00
mark_story
8c243ee731 Applying patch from 'mete0r', adding tests for Scaffold variable setting. Fixes #6361
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8172 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-13 01:00:38 +00:00
mark_story
8b24d976f2 Placing uninflected check before irregular rules. Refs [8169] and #6351
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8170 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-08 13:25:19 +00:00
mark_story
109bda97b8 Correcting order of inflection rules in pluralize(). Places uninflected rules before irregular rules. Fixes compatibility with non-english languages. Fixes #6351
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8169 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-08 03:17:26 +00:00
jperras
2e2aa0cd3a Cleaning up HttpSocket public/protected api; all protected methods are now prefixed with an underscore. Refactored associated tests. 2009-05-07 14:49:21 -04:00
mark_story
bf7e257e02 Updating coding standards in bake templates and scaffolds. Fixes #6346
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8167 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-07 00:53:44 +00:00
gwoo
d2667c0e6f merging master into 1.3 2009-05-04 16:06:08 -07:00
gwoo
6535e6225c merging 1.2 2009-05-04 15:57:10 -07:00
nate
8369a8f2d8 Sanitizing path in Dispatcher::baseUrl(), fixes #6336, misc. whitespace fixes.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8165 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-04 20:36:22 +00:00
gwoo
be7ade3a4c Support for non-valid cookie values, fixes #6327
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8164 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-04 20:13:10 +00:00
the_undefined
94c01ac7b4 Support for non-valid cookie values, fixes #6327 2009-05-04 21:53:39 +02:00