mark_story
6d9b000aee
Changing how mergeVars are handled, so the difference of app/current is used as a base.
...
Also fixing issues where passing settings to helpers in AppController could result in them not being correctly merged.
Thanks to hashmich for the partial patch.
Fixes #1183
2010-11-20 22:34:24 -05:00
mark_story
e0a8ffe8a3
Applying patch from 'jmccaffrey' to fix issues on windows where virtual
...
machine paths would not be correctly handled. Fixes #1254
2010-11-20 13:26:30 -05:00
PhpNut
82d46067ab
Corrected doc comment.
2010-11-17 15:00:27 -06:00
PhpNut
bed7767258
Removing __cache property that can be altered outside of the class definition.
...
Adding __resetCache() as a replacement for checking if cache should be reset and written.
2010-11-17 14:02:35 -06:00
mark_story
47f6a29998
Small optimizations in env() and Helper::_parseAttributes().
2010-11-16 22:24:54 -05:00
mark_story
d89581dcca
Changing object construction and method call to use file_put_contents.
2010-11-16 21:54:05 -05:00
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
mark_story
4c0fd76a2e
Changing <cake:nocache></cake:nocache> into <!--nocache--><!--/nocache--> This makes no cache tags valid html/xml at all times, and will not interfere with validation.
2010-11-07 13:23:45 -05:00
mark_story
c92ecdcd1b
Initial pass at decoupling CacheHelper from View.
...
CacheHelper does all caching using helper callbacks now.
2010-11-07 13:23:43 -05:00
mark_story
1bc6433ecd
Removing duplicate import() and fixing missing dependency.
2010-11-07 13:23:43 -05:00
mark_story
aaff059132
Moving output into a property, and removing extra arguments from helpers. Having a view property reduces the number of strings that are copied around.
2010-11-07 13:23:43 -05:00
mark_story
2dff74d037
Removing local and using output property.
2010-11-07 13:23:43 -05:00
mark_story
2e140a9fd3
Adding tests for element callbacks.
2010-11-07 13:23:43 -05:00
mark_story
32587c154c
Adding callback support to elements. You can use the 3rd parameter to control whether or not before/afterRender callbacks should be fired for a particular element.
2010-11-07 13:23:43 -05:00
mark_story
1b19ad48b4
Adding parameters to helper callbacks, these allow helpers to introspect more on the view/layout being rendered.
...
Updating tests.
2010-11-07 13:23:42 -05:00
mark_story
882efa883e
Removing the trigger_error and view re-renders and replacing them with exceptions.
2010-11-07 13:23:42 -05:00
mark_story
76919902b9
Removing direct tests of protected method.
...
Refactoring View with the intention of eventually removing coupling with CacheHelper.
Making Helpers load after the first rendering method is called.
Moving callbacks out of _render() to make logic simpler, and with the idea that elements will get a callback too.
2010-11-07 13:23:42 -05:00
mark_story
540f1426be
Removing View::error(). Instead you should be handling error states in your controller, or throwing exceptions and letting the application error handling deal with the error.
2010-11-07 13:23:42 -05:00
mark_story
3f61fa004e
Removing dead import.
2010-11-07 13:23:42 -05:00
Mark Story
8f31ef7149
Making $scripts_for_layout and $content_for_layout regular viewVars. This will allow helpers to manipulate them in callbacks.
...
Made $___dataForView an optional parameter, it defaults to $this->viewVars if left undefined. Refs #624
2010-11-07 13:23:42 -05:00
Mark Story
157bdfafc6
Moving beforeLayout, before additional viewVars are processed. Refs #624
2010-11-07 13:23:42 -05:00
mark_story
09d3a0626a
Updating l10n to use the new CakeRequest method.
2010-11-07 01:38:25 -04:00
mark_story
22bb07abb0
Adding visibility to a few methods.
2010-11-07 01:36:37 -04:00
mark_story
1424e02488
Adding a method to CakeRequest to parse out the accept-language header. This will help remove features from l10n.
2010-11-07 01:35:36 -04:00
ADmad
eb76ab95f2
Fixed issue where Model::saveAll() would incorrectly commit a transaction which was not started in that function call itself.
2010-11-06 09:33:50 +05:30
mark_story
d56b812181
Fixing issue where an array to string conversion error could occur if you had multiple values for a model's primary key and you created a matching form. Tests added.
...
Fixes #1257
2010-11-04 21:08:40 -04:00
mark_story
bff711e2dc
Merge branch '2.0-console' into 2.0
...
Conflicts:
cake/console/shells/acl.php
cake/tests/cases/console/libs/tasks/plugin.test.php
2010-11-02 23:49:19 -04:00
Juan Basso
b0a600f925
Merge branch '2.0-post-method' into 2.0
2010-11-03 01:42:06 -02:00
Juan Basso
adb2d90b9a
Changed the regex to follow the RFC 3986, working to protocols like "svn+ssh://" and "ed2k://"
2010-11-03 01:26:41 -02:00
Juan Basso
b752766d6c
Using full base when $url is empty.
2010-11-03 01:16:38 -02:00
mark_story
d1403b0da8
Changing NumberHelper::currency() to format < 1euro based on the suggestions from 'Joel Haasnoot'. Instead of 99c you will get €0,99.
...
Test cases updated. Fixes #1253
2010-11-02 21:56:24 -04:00
Mark Story
e6aeae8935
Fixing issue where value in difference array was always the string value instead of the original value.
2010-10-31 22:44:45 -04:00
Mark Story
a3da915abd
Fixing issue where value in difference array was always the string value instead of the original value.
2010-10-31 22:41:33 -04:00
Mark Story
c2063f1229
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2010-10-31 21:58:38 -04:00
Mark Story
b67d3fac44
Updating FormHelper to fix failing test from merge.
2010-10-31 21:57:51 -04:00
Mark Story
08e7bcb7ab
Merge branch '1.3' into integration
...
Conflicts:
app/config/core.php
cake/console/libs/acl.php
cake/console/templates/skel/config/core.php
cake/console/templates/skel/webroot/test.php
cake/dispatcher.php
cake/libs/view/errors/missing_action.ctp
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/log/file_log.test.php
cake/tests/cases/libs/model/cake_schema.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/groups/bake.group.php
cake/tests/groups/behaviors.group.php
cake/tests/groups/i18n.group.php
cake/tests/groups/javascript.group.php
cake/tests/lib/reporter/cake_cli_reporter.php
2010-10-31 21:56:59 -04:00
Juan Basso
7f448a1d35
Allowed the use of empty() and isset() in Controllers aliases properties.
2010-10-31 22:02:26 -02:00
Mark Story
b86bec14b5
Removing dead code in EmailComponent.
...
Fixes #1248
2010-10-31 00:00:54 -04:00
Juan Basso
e380b76e16
Created an exception to error 405 (Method Not Allowed) and changed the delete action in bake to use it.
2010-10-30 23:13:54 -02:00
Juan Basso
4eed660a62
Changed the form style to not affect layout.
2010-10-30 22:39:31 -02:00
Mark Story
d5f582beee
Merge branch 'master' of http://github.com/kwiky/cakephp into kwicky
2010-10-30 00:29:21 -04:00
Mark Story
3b5dafadc5
Adding value option documentation.
2010-10-29 23:56:22 -04:00
Robert Sworder
593c45b6e7
Whitespace changes
2010-10-29 23:43:50 -04:00
Robert Sworder
9eb533b9f6
dateTime functions + tests
2010-10-29 23:43:50 -04:00
Robert Sworder
a876c77987
meridian function
2010-10-29 23:43:50 -04:00
Robert Sworder
6d97aedd47
__selectOptions function
2010-10-29 23:43:50 -04:00
Robert Sworder
d3c1e8c974
minute function + tests
2010-10-29 23:43:49 -04:00
Robert Sworder
5f0700342b
hour function + tests
2010-10-29 23:43:49 -04:00
Robert Sworder
6620b3b8fc
month function + tests
2010-10-29 23:43:49 -04:00
Robert Sworder
529791842c
year function + tests
2010-10-29 23:43:49 -04:00
Robert Sworder
a1b1a07af2
__dateTimeSelected and day functions done, with tests
2010-10-29 23:43:48 -04:00