mark_story
acd2c15690
Merge branch '1.3-misc' into 1.3-merger
...
Conflicts:
cake/tests/cases/libs/configure.test.php
2009-11-15 20:09:12 -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
0783176238
Replacing duplicated code with pluginSplit().
...
Updating test case.
2009-11-15 19:55:20 -05:00
mark_story
28d3488cb2
Adding file headers to config files in test app.
...
Updating doc blocks.
Updating formatting.
2009-11-15 18:09:04 -05:00
ceeram
7a4793a20c
refactoring Configure::load() to load config files from plugins, tests and config files added
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-15 17:56:49 -05:00
mark_story
63ab96d751
Setting $primary = false inside DboSource::queryAssociation. Fixed #208
2009-11-15 17:48:41 -05:00
predominant
0049c9ad81
Renaming Helper::__name to Helper::_name for proper access level for extension overloading and callback.
2009-11-15 21:18:46 +11:00
mark_story
fa14f9cebc
Merge branch '1.3-validation' into 1.3-misc
2009-11-14 20:46:48 -05:00
mark_story
be9f0ec4c7
Renaming method so they match those in Cache.
...
Removing method that was missed during previous refactor.
Updating tests.
2009-11-14 20:42:57 -05:00
mark_story
b7e7eff738
Fixing doc blocks.
2009-11-14 20:24:18 -05:00
mark_story
70820e2e96
Renaming unconfig to drop.
2009-11-14 20:18:58 -05:00
mark_story
caedbdf98a
Adding Cache::configured() and Cache::unconfig(). configured() allows introspection on the currently configured settings. unconfig() allows for the removal of cache configs.
...
Tests added.
2009-11-14 20:10:40 -05:00
mark_story
59a7cee89d
Removing deprecated $config parameter handling. $config must be a string that is the name of an existing cache config.
2009-11-14 20:10:40 -05:00
mark_story
b6978ab25f
Adding the ability to load cache engine classes from plugins and app libs.
...
Also enabled the ability for App cache classes to override core ones.
Test cases added.
Removed unnecessary subclassing of Object.
2009-11-14 20:10:40 -05:00
mark_story
3c349dd15c
Removing unnecessary inheritance from Object.
2009-11-14 20:10:40 -05:00
mark_story
2740fd6714
Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc
2009-11-14 19:42:24 -05:00
mark_story
17e377de7e
Updating doc block for MemcacheEngine
2009-11-14 19:40:30 -05:00
ADmad
862ff82ad4
Updating Configure::store to fix escaping issues
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-14 19:38:53 -05:00
mark_story
06d4e5e553
Reformatting code in memcache.
...
Adding unset() to test case to remove unnecessary keys that can cause test failure.
2009-11-14 18:50:23 -05:00
mark_story
3712072531
Applying optimization to Router::connect() from 'robustsolution' Fixes #302
2009-11-14 16:32:18 -05:00
mark_story
8b1a2b1f72
Applying optimization in Router::__parseExtension from 'robustsolution'. Fixes #301
2009-11-14 16:29:33 -05:00
predominant
0977b3fe15
Standardising docblock endings throughout.
2009-11-14 23:19:25 +11:00
mark_story
9376826aa4
Fixing HttpSocket::buildUri when host key is empty.
...
Tests added
Fixes #271
2009-11-13 14:42:40 -05:00
mark_story
d93c94f702
Fixing failing test, picked in from 1.2.
2009-11-13 09:53:31 -05:00
ceeram
a67a97722a
refs #291
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-13 09:25:47 -05:00
mark_story
2c5fa171e0
Updating CakeSchema to pass a Model object into DboSource::fullTableName(); Fixes schema's not correctly reading tablePrefixes.
...
Fixes #290
2009-11-13 00:43:40 -05:00
nate
1c8a2f232b
Changes Model::find() to allow modification of DataSource connection during callbacks.
2009-11-12 14:48:03 -05:00
mark_story
47e6f332d7
Reformatting doc blocks.
2009-11-10 23:35:45 -05:00
mark_story
63ee8f0fcd
Starting pass through validation handling.
...
Implemented phone, and postal pass throughs.
Adding tests.
2009-11-10 21:20:39 -05:00
mark_story
c5a41913c3
Merge branch '1.3' into 1.3-misc
2009-11-10 20:22:42 -05:00
mark_story
f0628d100b
Fixing issues with getting values from habtm data after form posting and validation has failed.
...
Tests added.
Refs #279
2009-11-09 21:00:19 -05:00
mark_story
f5cfab7b4f
Merge branch '1.3' into 1.3-misc
2009-11-09 20:10:56 -05:00
predominant
26e19caad5
Removing unnecessary getInstance() calls.
2009-11-10 10:30:13 +11:00
mark_story
fa1b7f617f
Fixing issues caused by merge with 1.2.
2009-11-09 14:07:19 -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
mark_story
7981b44db4
Merge branch '1.3-misc' into mergers
2009-11-08 21:39:55 -05:00
mark_story
a7a6dc8c43
Fixing issue where SecurityComponent::_validatePost could generate notices if elements were removed from _Token array.
...
Tests Added
Fixed #228
2009-11-08 14:12:18 -05:00
mark_story
6b79c8d375
Adding checks for parent classname when converting error method names. Fixes #273
2009-11-08 14:07:25 -05:00
mark_story
82a2b1a019
Changing import of Dispatcher to direct require.
...
Modifying order of operations in Configure::__loadBootstrap()
moving inclusion of app/config/bootstrap.php after the creation of core cache configs. This allows App::import() to be used in the bootstrap file with cached paths.
2009-11-07 17:53:14 -05:00
mark_story
6db91b0f49
Fixing issues in ContainableBehavior that could leave models unbound when 'fields' was used as part of containment conditions. Fixes #253
2009-11-07 17:43:18 -05:00
mark_story
30dc0cfe56
Removing unused $view property from CacheHelper.
...
Fixes #272
2009-11-07 10:44:14 -05:00
mark_story
4a08bd120d
Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc
2009-11-07 10:41:12 -05:00
mark_story
4704a8cd00
Removing unused $view property from CacheHelper.
...
Fixes #272
2009-11-07 10:40:48 -05:00
ADmad
002a01a9d8
passedArgs from current request are auto merged with url options of paginator helper
...
Signed-off-by: Florian Krämer <florian.kraemer@cakedc.com>
2009-11-06 18:31:42 +01:00
mark_story
4deaf27cc0
Removing deprecated code in Html::css()
...
Minor refactoring in HtmlHelper methods.
Fixes #268
2009-11-06 09:31:57 -05:00
mark_story
ab76cb1217
Merge branch '1.3' into 1.3-misc
2009-11-06 09:25:11 -05:00
mark_story
e7c2fe2b7e
Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc
2009-11-06 09:24:55 -05:00
SkieDr
ce15cc61d9
Fix order of keys in l10n catalog list
2009-11-06 15:46:54 +03:00
predominant
62810fb4f4
Updating more Copyright dates.
2009-11-06 18:04:38 +11:00
predominant
1185681549
Removing newline caused by Subversion line removal.
2009-11-06 18:01:22 +11:00
