gwoo
6775e0997e
Merge branch '1.2' into 1.3
2009-08-03 13:13:18 -07:00
jperras
d41a28c975
Fixing PHP4 compatibility issues for SecurityComponent.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8282 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-03 19:40:02 +00:00
mark_story
401796e1a9
Adding missing reference operators in Controller::paginate().
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8277 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-03 17:55:16 +00:00
mark_story
29dd4ddf03
Fixing issues in Scaffold Test case with PHP4.
...
Cleaning up code formatting in Scaffold.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8276 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-03 17:38:40 +00:00
AD7six
a4bc755cc7
whitespace normalization
2009-08-02 16:10:24 -07:00
gwoo
15ed658a27
Revert "Merge branch '1.3-newlines' into 1.3"
...
This reverts commit c088131cd8e9f53396852e8a320e2b0396807d20, reversing
changes made to 9341a2bb5eda1db208019aa8a9171224fb76fc6b.
2009-08-02 15:59:54 -07:00
gwoo
bf2b8a60e6
Merge branch '1.3-misc' into 1.3
2009-08-02 12:20:07 -07:00
gwoo
d118c6a764
Merge branch '1.3-newlines' into 1.3
2009-08-02 12:08:55 -07:00
gwoo
1423b0067b
Merge branch '1.2' into 1.3
2009-07-30 11:34:33 -07:00
DarkAngelBGE
f88cc56cfe
Coding standards fixes
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8260 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-28 20:01:42 +00:00
AD7six
fd0aaefb39
whitespace normalization
2009-07-26 12:46:07 +02:00
gwoo
062f471b7f
updating App::import usage. ran each test and everything seems ok.
2009-07-25 18:27:02 -07:00
AD7six
b2142df2bc
adding a newline before all comment blocks
2009-07-24 21:18:37 +02:00
jperras
e40428801e
Removing all uses of uses() global method & replacing with require or App::import.
2009-07-24 13:41:08 -04:00
gwoo
a9d98e73c3
Merge branch '1.2' into 1.3
2009-07-22 09:27:31 -07:00
DarkAngelBGE
3e14d281df
fixes #6397 , removing unneeded line feed in email component headers, adding tests
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8248 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-22 16:04:53 +00:00
DarkAngelBGE
caeac73562
Applying patch from ' matsinet', fixes #6475 , EmailComponent ignoring sendAs when attachments present, adding tests
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8242 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-21 21:54:05 +00:00
gwoo
a2f0ab8b27
Merge branch '1.2' into 1.3
2009-07-20 09:31:56 -07:00
mark_story
02ed77ab20
Adding tests for calling RequestHandlerComponent::renderAs() twice.
...
Fixing issue where viewPath was not updated.
Fixes #6466
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8230 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-14 03:52:06 +00:00
jperras
4f44a15470
EmailComponent::reset now empties out attachments array. Fixes #6498 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8226 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-10 00:07:51 +00:00
gwoo
f1a4352620
Merge branch '1.2' into 1.3
2009-07-03 08:24:42 -07:00
mark_story
f79a68b2a6
Minor refactor of variable names.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8215 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-03 00:20:54 +00:00
gwoo
2ba8e8777c
Merge branch '1.2' into 1.3
2009-07-02 16:12:50 -07:00
gwoo
bc359259a2
Merge branch '1.2' into 1.3
2009-07-02 09:27:00 -07:00
jperras
a6d3193a6d
Updated EmailComponent::__strip regex for mailto: links. Fixes #6464 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8211 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-02 02:58:43 +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
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
gwoo
13550a140a
fixing require cake_session in session component
2009-06-24 15:05:08 -07: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
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
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
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
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
gwoo
15518b8c9a
merging 1.3-misc into master
2009-05-01 14:05:46 -07:00
gwoo
db71202aac
Merge branch '1.2' into 1.3
2009-05-01 08:26:02 -07:00
mark_story
c8cf1a2c5b
Updating __mergeVars to correctly merge parent and child component configurations.
...
Applied patch from 'neilcrookes'.
Test case added. Fixes #6325
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8157 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-28 01:32:20 +00:00
mark_story
b68c78fc0f
Fixing lost querystring params when user request without a session is performed. Test case updated. Fixes #6211
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8156 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-25 02:16:05 +00:00
jperras
97abf84770
EmailComponent:: now is set to null after calling EmailComponent::reset(). Test cases added; fixes #6314 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8153 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-25 00:01:57 +00:00
jperras
650d1e7c78
Removing hard coded HELO hostname of 'cake' in EmailComponent; better compliance with RFC-821 3.5. Test cases added. Fixes #6264 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8152 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-24 18:20:51 +00:00
gwoo
ec18aac4ab
Merge branch 1.2 into 1.3
2009-04-15 15:16:01 -07:00
mark_story
97652231a0
Fixing RequestHandlerComponent::prefers() with array input. Test case updated. Fixes #6290
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8141 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-14 13:16:25 +00:00
mark_story
9491e4632d
Applying patch from 'SkieDr' to fix custom find type pagination. Removes parameters from exiting paginate(). Test case added.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8137 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-07 14:56:30 +00:00
gwoo
643651fe56
Merge master in 1.3
2009-03-19 14:10:13 -07:00
renan.saddam
76e0f17dbc
Updating documentation to improve code completion
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8114 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-17 21:10:28 +00:00
mark_story
eba2e78d06
Fixing typo in last commit.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8108 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-16 03:06:28 +00:00
mark_story
4dceb5be31
Adding doc blocks for properties that previously had no documentation. Closes #6199
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8107 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-16 03:01:51 +00:00
jperras
b22ddc11f9
Renaming socket.php to cake_socket.php . Changing associated App::import calls.
2009-03-15 16:52:27 -04:00
gwoo
6cb8b3d286
Merge branch 'master' into 1.3.x.x
2009-03-14 13:57:18 -07:00
jperras
ba78e04be9
Fixing doc block for parameter of Controller::flash. Thanks 'ADmad'.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8083 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-09 01:11:38 +00:00