Commit graph

212 commits

Author SHA1 Message Date
mark_story
58383d3cb9 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/model.php
2009-11-15 20:05:55 -05:00
mark_story
6039d6ebe4 Applying optimization in Dispatcher::parseParams() from 'robustsolution'. Fixes #309 2009-11-15 15:32:58 -05:00
mark_story
6b5c247162 Merge commit 'origin/1.2' into mergers
Conflicts:
	cake/bootstrap.php
	cake/console/cake.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/paginator.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
2009-11-08 22:21:21 -05:00
predominant
384bb7a0e0 Update license lines throughout. 2009-11-06 17:51:51 +11:00
predominant
d7b604c8ed Fixing links throughout 2009-11-06 17:46:59 +11:00
predominant
6782cb019c Update CakePHP Project link. 2009-11-06 17:00:11 +11:00
predominant
5dfe1777af Removing Subversion file headers. 2009-11-06 16:51:09 +11:00
predominant
ceee56013c Remove Subversion $Date$ lines. 2009-11-06 16:17:01 +11:00
predominant
04f1b6cdfe Remove Subversion $LastChangedBy$ lines. 2009-11-06 16:11:16 +11:00
predominant
42f3f16d60 Remove subversion $Revision$ lines. 2009-11-06 16:08:02 +11:00
predominant
1b9b0aae5e Updating Copyright date to include 2009. 2009-11-06 15:34:28 +11:00
predominant
8f75ff58c7 Removing @filesource 2009-11-06 15:24:02 +11:00
mark_story
8c46cc49fb Fixing issue in Dispatcher::cached() where plugins ending in asset extensions would be incorrectly handled.
Test added
Fixes #237
2009-11-03 13:14:38 -05:00
mark_story
2f81c29def Updating $pluginPath loops to use App::pluginPath(). 2009-10-14 09:47:07 -04:00
mark_story
326424592d Merge branch '1.2' into 1.2-merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/dispatcher.php
	cake/libs/controller/scaffold.php
	cake/libs/inflector.php
	cake/libs/view/view.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
2009-09-13 13:52:58 -04:00
jperras
adc198805f Dispatcher::parseParams() now works with file uploads that are not indexed by model. Fixes #9 2009-08-13 11:29:00 -04:00
burzum
1a86de5fe3 Correction to escape the / 2009-08-12 17:11:36 +02:00
burzum
417bdb4514 Fixing building of the right vendor path in the dispatcher in the case the plugin name appears again in the path 2009-08-12 16:08:31 +02:00
gwoo
01d22ffd2e fixing up some App::import calls 2009-07-30 15:01:22 -07: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
gwoo
a9d98e73c3 Merge branch '1.2' into 1.3 2009-07-22 09:27:31 -07:00
gwoo
c1bb9700f9 fixes #6509, dispatcher uri error on IIS
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8237 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-21 01:31:50 +00:00
gwoo
c3643767bf some more updates to path handling 2009-06-10 16:13:39 -07:00
gwoo
24d78dd671 moving path configuration to App class 2009-06-07 15:24:10 -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
779b367d3b adding some more test for dispatcher with array urls mainly used by request action. updated docblock
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8056 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-25 01:36:13 +00:00
gwoo
b62202f888 fixes #6117, wrong controller name in debug messages
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8042 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-17 23:32:15 +00:00
gwoo
5bb922323c fixes #6106, dispatcher plugin controller params
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8037 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-16 18:39:09 +00:00
gwoo
b35de27de1 fixes #5866 and fixes #6069, bugs in dispatcher with plugins and params
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8033 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-16 00:18:59 +00:00
TommyO
f7a62bc80d Fixed bug where filename did not match between cache engine and dispatcher in some cases.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7950 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-22 19:01:17 +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
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
mark_story
1b456f2cf1 Applying patch from 'davidpersson' fixing code spacing. Closes #5643
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7772 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 00:10:44 +00:00
AD7six
f32e557e9c converting ini_get statements to use strict comparisons where loose comparisons were used
correcting zlib comparison to expect ini_get to return a string, rather than a boolean.


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7768 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-21 12:15:28 +00:00
nate
906dbcccbf Ensuring Dispatcher does not return an empty action, fixes #5434
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7615 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-17 15:17:23 +00:00
phpnut
cb487bd6e6 More optimization refactoring.
Fix cache but causing  object_map to be created and deleted on each request.
Replacing function and method calls with better performing code.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7596 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-12 05:11:34 +00:00
nate
b7b235c2a5 Small test-correcting fix for Dispatcher
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7593 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-12 02:06:53 +00:00
gwoo
253c5a87ec closes #5330, broken camelCased actions from [7502]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7510 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-26 18:33:00 +00:00
gwoo
126602902d fixes #5313, browser freeze with content length header on compressed assets. Some refactoring to improve speed, refactored Folder class to use read() inside of tree()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7502 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-25 22:55:10 +00:00
mark_story
c54fd3c720 Applied patch from 'djclue917' to fix multiple file uploads for multi record forms. Tests Added. Closes #5237
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7493 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-24 16:44:33 +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
gwoo
d6d7bd68bd changing include to readfile, fixes #5033
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7354 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-23 20:53:59 +00:00
mark_story
684fb5fcce Replaced in_array() with array_key_exists(). Closes #4465
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7336 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-12 00:23:08 +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
52b9f7a889 closes #4903, closes #4669 allows serving images from vendors and plugin vendors
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7200 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-17 04:24:55 +00:00
gwoo
01bf6526c4 fixes #4911, scripts for layout on cache refresh
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7197 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-15 19:48:15 +00:00
gwoo
069fb0011c fixes #4839, assets served from vendors must provide proper extension to ensure accurate content type header is set
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7185 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-14 21:05:06 +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