Commit graph

5346 commits

Author SHA1 Message Date
mark_story
d12c232d8a Merge branch '1.3' into merger
Conflicts:
	app/config/core.php
	cake/console/templates/skel/config/core.php
	cake/dispatcher.php
	cake/libs/controller/components/auth.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
	cake/tests/lib/cake_test_case.php
2010-11-16 21:48:13 -05:00
mark_story
5349257bbd Changing empty() to !isset() to avoid additional cache hits when po files are missing or empty. 2010-11-16 07:32:14 -05:00
mark_story
66e6ec763e Merge branch 'dispatcher-request' into 2.0
Conflicts:
	cake/libs/configure.php
	cake/tests/cases/libs/all_routing.test.php
	cake/tests/cases/libs/controller/controller.test.php
2010-11-15 22:42:54 -05:00
mark_story
293ef95f33 Adding more documentation, and adding some return early changes. 2010-11-14 18:43:46 -05:00
mark_story
db3f74dfa0 Moving a method around. 2010-11-14 18:38:10 -05:00
mark_story
070066be18 Expanding doc blocks for Dispatcher.
Extracting _isPrivateAction() so subclasses could change the behavior.
2010-11-14 18:37:27 -05:00
mark_story
1631f31460 Adding doc comments to Configure and App. 2010-11-14 18:26:54 -05:00
mark_story
1b89547c58 Pulling App out into its own file. Trying to stick with one class per file conventions.
Removing class_exists check, as Set is loaded during the framework
bootstrap.
2010-11-14 13:02:30 -05:00
mark_story
afd2683602 Adding a check for loaded routes. This prevents routes being loaded on each dispatched action, such as when requestAction is called. 2010-11-14 01:12:39 -05:00
mark_story
f27566336c Renaming private method to protected.
Removing return by reference operator.
2010-11-14 01:08:13 -05:00
mark_story
f36f38e7f6 Adding doc blocks and adding type hints for _invoke(). 2010-11-14 01:05:42 -05:00
mark_story
f02e0483ee Reworking parameter munging specific to requestAction into requestAction. Updating tests cases for Object. As request->data is an array() not null. And leading / is trimmed off of [url][url]. 2010-11-14 01:01:11 -05:00
mark_story
ea80a6dbbb Removing instance variables that were no longer needed, as they weren't actually being used for much. 2010-11-14 00:16:07 -05:00
mark_story
1fe84c00dd Starting to try and simplify the bootstrap process, and give a choice
over which GET param is used for cake's url.
2010-11-14 00:06:01 -05:00
mark_story
dad7963ea4 Moving Dispatcher inside libs directory, as it is part of CakePHP's libs. 2010-11-14 00:00:23 -05:00
mark_story
6073ac5dfa Fixing errors caused by accessing things that don't exist. 2010-11-13 23:57:01 -05:00
mark_story
c7fed2ecba Removing duplicate calls to Inflector. 2010-11-13 21:08:26 -05:00
mark_story
9b08b725fe Merge branch '2.0' into 2.0-view
Conflicts:
	cake/libs/controller/controller.php
	cake/libs/view/helpers/cache.php
2010-11-13 21:03:54 -05:00
mark_story
4c3337598e Updating version numbers for 1.3.6 2010-11-13 20:01:20 -05:00
mark_story
01894b315f Fixing issues caused by not accessing the request object correctly. 2010-11-12 23:14:34 -05:00
mark_story
18bb5f6b8b Removing =& operators for construction of objects. 2010-11-12 23:05:44 -05:00
mark_story
47fa4713b1 Pulling ScaffoldView into a separate file. 2010-11-12 22:54:28 -05:00
mark_story
85e072a64b Removing reference operators in view class constructors. 2010-11-12 22:51:53 -05:00
mark_story
4e3b62e466 Removing vestigial method in App.
Fixing E_STRICT error in Router.
2010-11-10 23:43:48 -05:00
mark_story
6c2b088706 Merge branch '2.0' into 2.0-view 2010-11-10 23:41:44 -05:00
mark_story
76c3e1a112 Adding cache comment stripping to the CacheHelper, it was recently removed from View, and needed to be added here to fix failing tests. 2010-11-09 23:55:30 -05:00
mark_story
6c0dfe9592 Fixing error where params[url] has moved. 2010-11-09 23:44:33 -05:00
mark_story
ee0dc785b2 Removing cache comment stripping, they are harmless in html/xml. 2010-11-09 22:37:02 -05:00
mark_story
7ad4068085 Refactoring to remove some duplication. 2010-11-09 22:27:36 -05:00
mark_story
1cf5e72054 Removing duplicated calls to slug()
Extracting getElementFilename() into a method, this should allow developers to more easily replace how elements are found.
Refs #1268
2010-11-09 22:16:45 -05:00
José Lorenzo Rodríguez
8c2f9e1d2b Removing E_STRICT errors from router 2010-11-08 22:38:30 -04:30
José Lorenzo Rodríguez
afa5ee6885 Removing E_STRICT errors from connection manager 2010-11-08 22:37:34 -04:30
José Lorenzo Rodríguez
2fa653d2f3 Removing E_STRICT errors from i18n 2010-11-08 22:37:09 -04:30
José Lorenzo Rodríguez
398adbbc7a Removing E_STRICT errors from debugger 2010-11-08 22:36:48 -04:30
José Lorenzo Rodríguez
4cba8a12a0 Removing E_STRICT errors from Configure and App class 2010-11-08 22:36:38 -04:30
José Lorenzo Rodríguez
62017b2e38 Removing E_STRICT errors from ClassRegistry 2010-11-08 22:35:55 -04:30
José Lorenzo Rodríguez
09011d1010 Removing E_STRICT errors from CakeSession 2010-11-08 22:35:31 -04:30
mark_story
e8678b38ac Adding specific conditions to model->delete's call to dbo->delete. This
helps fix a race condition where dbo->defaultConditions could cause
additional data loss.  Fixes #250
2010-11-08 21:50:45 -05:00
Juan Basso
b413aa99d9 Removing instance by reference. 2010-11-08 23:51:45 -02:00
mark_story
dfefc2d97b Very initial pass at getting elements cached with Cache. Refs #1268 2010-11-08 00:06:10 -05:00
Ceeram
bc7770aa83 removing useless calls to mapActions()
Signed-off-by: mark_story <mark@mark-story.com>
2010-11-07 23:16:41 -05:00
mark_story
e431e86aa4 Fixing issue found by Felix Wilhelm(flxm) where users could send potentially dangerous or corrupted serialized objects to SecurityComponent, potentially allowing manipulation of file map caches. Test case added. 2010-11-07 20:53:04 -05:00
Jeremy Harris
c98306727d Merge branch '2.0-redirect' into 2.0 2010-11-07 17:42:04 -08:00
Jeremy Harris
7630580511 Added support for redirection routes. Fixes #1151 2010-11-07 17:33:05 -08:00
Jeremy Harris
060f149a84 Added configurable ellipsis on Paginator::numbers(), Paginator::first(), Paginator::last(). Fixes #1086 2010-11-07 17:08:01 -08:00
mark_story
3216c902cd Removing the enable parameter on HelperCollection, BehaviorCollection, and ComponentCollection. They all now support the enabled option that Behaviors have historically supported. This provides a simpler API with fewer arguments, and allows callbacks to be disabled on objects in their declared arrays.
Test cases updated.
2010-11-07 13:23:45 -05:00
mark_story
22497eb41c Fixing failing tests in controller test. 2010-11-07 13:23:45 -05:00
mark_story
88c717dbd8 Removing the 3rd param from ObjectCollection::load() and adding a uniform setting of 'callbacks'. This setting is used to disable callbacks on objects by convention. Test cases updated. 2010-11-07 13:23:45 -05:00
mark_story
1ba28c246b Adding settings['callbacks'] as a way to define enabled/disabled state of helpers in settings arrays. This should replace the separate parameter.
Tests updated.
2010-11-07 13:23:45 -05:00
mark_story
92fec4588a Making private things protected. 2010-11-07 13:23:45 -05:00