Commit graph

231 commits

Author SHA1 Message Date
burzum
07870bacfb Merge branch '1.3' of git://github.com/cakephp/cakephp1x into 1.3 2009-12-17 00:32:37 +01:00
burzum
7aca8dfea4 Refactoring Dispatchter::cached() and moving asset related code from this method into separate methodes 2009-12-17 00:32:20 +01:00
Mark Story
5c6d59ea13 Adding tests for dispatching plugin shortcut urls.
Refactoring Dispatcher::__getController, Dispatcher::_restructureParams to fix compatiblity between router and Dispatcher.
2009-12-16 16:33:08 -05:00
mark_story
bbb61b28f7 Merge branch '1.3-misc' into mergers 2009-12-06 21:11:26 -05:00
mark_story
779479fb8c Removing unused property. 2009-12-03 21:51:44 -05:00
mark_story
547ed839d9 Correcting constructor of MediaView to fix issues with viewVars not being set.
Correcting use of MediaView in Dispatcher.  Fixes #366
2009-12-01 09:50:27 -05:00
mark_story
02f9275e20 Removing automagic -! sql no-escape string handling. Removing use of Router::stripEscape() from Dispatcher, as this method removed -! from url + post data. 2009-11-28 23:02:59 -05:00
phpnut
43fdde2dad Removing unneeded code in Dispatcher::cached();
Fixing path search for themes
2009-11-27 00:49:20 -06:00
renan.saddam
f9204ebe7c Adding $pos = 0; to avoid php notice. 2009-11-26 17:52:14 -02:00
phpnut
2eb85ef558 Removed App::path('plugins'); in favor of App::pluginPath($plugin); removing need for foreach() 2009-11-25 13:04:30 -06:00
phpnut
d685c18720 Adding checks for directory traversal attempts related to recent changes allowing plugins and themes to include their own webroot/* assets 2009-11-25 12:41:19 -06:00
phpnut
49c11a8219 More work allowing assets in themes and plugins. 2009-11-25 11:06:28 -06:00
phpnut
0977029c89 Removing limit of image, js and css in plugins 2009-11-25 09:47:23 -06:00
phpnut
c942fa7038 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-25 08:40:14 -06:00
phpnut
2254bfe5c9 Adding ability for plugins to have there own webroot.
plugins/<PLUGINNAME>/webroot/*

Themes can also be self contained with a webroot directory.
app/views/themed/<THEMENAME>/webroot/*

vendors directory for assets is deprecated and no longer supported
2009-11-25 01:51:25 -06:00
mark_story
4d37e75f18 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/controller/components/cookie.php
	cake/libs/debugger.php
	cake/libs/flay.php
	cake/libs/http_socket.php
	cake/libs/inflector.php
	cake/libs/model/cake_schema.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/router.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
robustsolution
b0aec35422 Dispatch::baseUrl() needs optimization a little bit
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-22 12:30:54 -05:00
mark_story
a30aec99fd Applying patch from 'robustsolution' for optimization in Dispatcher::dispatch. Fixes #317 2009-11-21 21:00:15 -05:00
Juan Basso
911a99bf23 Replace function preg_split by explode when possible.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:52 -05:00
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