AD7six
b2142df2bc
adding a newline before all comment blocks
2009-07-24 21:18:37 +02:00
gwoo
bc359259a2
Merge branch '1.2' into 1.3
2009-07-02 09:27:00 -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
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
gwoo
ec18aac4ab
Merge branch 1.2 into 1.3
2009-04-15 15:16:01 -07: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
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
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
mariano.iglesias
591b9f0582
Fixing wrong usage of array_shift added in r7013
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8072 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-03 23:58:55 +00:00
mark_story
af021cb4b2
Adding Html entity conversion to all urls generated by helpers, fixing potential for merged passedArgs to create xss vectors.
...
Adding integer cast in paginate() to page param.
Tests added/updated.
Fixes #6134
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8061 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-25 19:51:41 +00:00
gwoo
43ad3d76e5
updating code from [8024] [8025]
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8031 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-15 20:13:14 +00:00
mark_story
e045e6826a
Fixing Session from being added to components array twice.
...
Fixing greedy mergeVars with AppController.
Tests Added
Fixes #6091
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8024 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-12 13:36:20 +00:00
gwoo
f0d03a91cf
Merge branch 'master' into 1.3.x.x
2009-02-09 12:01:06 -08:00
mark_story
4b00c29eef
Updating doc blocks to improve readability in API.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8015 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-04 05:00:59 +00:00
nate
c7d133fc0f
Removing variable name inflection from Controller::set()
2009-01-20 14:36:39 -05:00
AD7six
d80e527e5b
fixes #5776
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7882 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-20 16:53:45 +00:00
gwoo
a99ca57762
fixes #5687 , adding Controller::methods to hold available methods for called controller, refactored auth and dispatcher to use this property
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7864 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-11 16:34:05 +00:00
john
863adabe12
Updating Controller docblocks with @link and updating docblock content and grammar.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7808 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 19:30:17 +00:00
AD7six
3f2fa6929b
changing tabs for spaces in comment block indentation
...
Removing address and replacing with cakefoundation url
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
AD7six
ce0a71aef7
fixes #5603 Duplicate first parameter from the paginator with existing url args
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7777 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 22:20:03 +00:00
gwoo
443491e7fa
reverting changes from 7668
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7689 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-02 02:16:09 +00:00
nate
300dbc5e91
Correcting how parameters and default values are merged in Controller::paginate(), fixes #5503
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7688 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-02 00:46:26 +00:00
nate
4b8acf4647
Adding 'type' key to both sets of query calls in Controller::paginate(), fixes #5441
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7680 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-29 21:19:37 +00:00
gwoo
f8f4bcc16c
fixes #5482 , playing with model that uses alias
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7668 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-26 15:27:36 +00:00
mark_story
62168bfe0f
Updating doc blocks to include access and return PHPDOC tags.
...
Removing use of e() in Debugger.
Fixing code formatting in CookieComponent
Closes #5477
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7662 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-25 16:49:56 +00:00
DarkAngelBGE
e245d18ed8
fixes #5469
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7648 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-23 12:04:02 +00:00
mark_story
fafb01b09d
Fixing modelClass when using plugin models.
...
Added TestPluginPost to test_app/test_plugin
Test case added.
Closes #5459
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7641 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-22 04:10:49 +00:00
mark_story
768e25c4fd
Updating Controller::paginate(). Custom paginate() and paginateCount() methods now receive $extra params similar to find('all') and find('count') do. Allows the use of things like 'contain' with custom paginate() methods.
...
Test case added. Closes #5433 refs #5123 .
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7627 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-19 00:46:20 +00:00
nate
66240f0c5d
Refactoring DboPostgres and adding '.' to sequence name detection, fixes #5424 , fixing code formatting
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7620 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-18 00:23:17 +00:00
phpnut
5658e26e07
Changing comparison operators to === (identical) which is faster than == (equal)
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7604 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-14 17:17:49 +00:00
DarkAngelBGE
19d4f3d596
adding a couple 'return home early' refactorings
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7572 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-08 20:33:48 +00:00
mark_story
8a76b86c85
Updating doc block for Controller::flash(). Closes #5333
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7511 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-26 18:35:44 +00:00
TommyO
570145d568
Added test to show (deprecated?) support of string status codes in redirect().
...
Fixed fail on string status codes in redirect().
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7410 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 11:27:53 +00:00
gwoo
4a94397b43
removing deprecated code
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7401 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 01:04:03 +00:00
TommyO
b6e9888753
Replaced all instances of ife() in /cake
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7387 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-30 20:34:01 +00:00
gwoo
460b219810
small refactor to Controller::paginate handling of sort direction
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7369 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-27 15:55:19 +00:00
gwoo
e26b7e7a63
refactor dispatcher, fixes #5033
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7365 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-26 20:09:20 +00:00
mark_story
cc098629a6
Added direction check to Controller::paginate(). paginate() now forces 'asc' when wrong. Added tests. Closes #5120
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7357 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-24 02:46:39 +00:00
phpnut
022ffa3f4f
Adding fixes for pagination on associated models.
...
Corrected dot notation use in Controller::paginate();
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7286 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-27 06:25:08 +00:00
gwoo
b8714ede74
fix to paginate sort order for self associated models
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7278 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-27 03:12:45 +00:00
gwoo
1576a83505
fixing issue with sort in pagination and adding tests, removes previously deprecated controller methods and adds trigger_error to recent ones
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7276 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-27 00:43:31 +00:00
nate
df75a06756
Fixing coding standards violations in core, and adding misc tests
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7222 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-20 20:17:23 +00:00
gwoo
97a57a0f05
fixing bug in error handler when callbacks were moved to construct classes, moved callbacks back to dispatcher for now until we find a better place in the controller, fixed caching for the "home" page by adding check for "/', original test case was incorrect.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7177 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-12 18:36:08 +00:00
phpnut
6807d4c333
Starting initial refactoring of current code base.
...
Made changes to test suite to allow running test without headers already sent errors.
Moved Component::initialize(), Controller::beforeFilter(); and Component::startup(); from Dipatcher::start() to Controller::constructClasses();
Removed Dispatcher::start();
Fixing model instances not being created
Adding additional test to CookieComponent to increase coverage to 95%
Optimizing Set::diff();
Fixing SessionComponent test and RequestHandlerComponent test
Fixing CakeSession tests, removed deprecated code from CakeSession
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7162 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-10 22:38:05 +00:00
the_undefined
2d8e63ae7b
Refactored and updated postConditions to new operator syntax, fixes #4860
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7145 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-09 08:29:56 +00:00