Mark Story
8960a01649
Merge branch '1.3-misc' of git@github.com:cakephp/cakephp1x into 1.3-misc
2009-12-16 23:08:00 -05:00
Mark Story
9230bb93af
Merge branch '1.3' into 1.3-misc
2009-12-16 23:07:44 -05:00
Mark Story
ff74a599c6
Adding ability to set configuration from initialize() for RequestHandler.
...
Tests added.
2009-12-16 23:06:16 -05:00
Mark Story
5760f41124
Adding tests for component config setting from initialize()
2009-12-16 23:06:16 -05:00
Mark Story
e45fcf4337
Adding ability set component configuration from component settings for SecurityComponent.
2009-12-16 23:06:16 -05:00
Mark Story
3a6b29d042
Updating security component test case to use startTest and endTest
2009-12-16 23:06:16 -05:00
Mark Story
dffff314e1
Implementing setting of auth configuration through component settings arrays.
...
Adding test case from Ceeram.
2009-12-16 23:06:16 -05:00
Mark Story
aa3a197b26
Reformatting test case. Fixes #104
2009-12-16 18:40:45 -05:00
real34
bdfb50e6bb
Fixed a bug in Set::extract. Wrong key returned when two arrays are at the extraction level.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-16 18:33:23 -05:00
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
7ceb50b696
Removing controller key as a default when Routes are connected. Was causing issues when using regex qualifiers on controller keys.
...
Tests added.
2009-12-16 15:04:59 -05:00
Mark Story
a490e249fa
Adding test for validation of with models canceling a save.
...
Adding initial implementation of Model::__validateWithModel().
Correcting error in previous commit. Adding tests for saveAll and validating habtm with models.
2009-12-15 22:55:22 -05:00
Mark Story
ecc38f0aed
Adding additional tests for CakeRoute::persistParams(). Ensures that url params can overwrite persisted values.
...
Tests added.
2009-12-14 18:43:29 -05:00
Mark Story
4f985e465b
Applying patch from 'kleingeist'. JsHelper::set() now generates a variable that is assigned to window.$var instead of creating a local variable by default.
...
Tests updated.
Fixes #96
2009-12-13 23:53:20 -05:00
predominant
aaddd0d394
Moving certain datasources to the Datasources Plugin ( http://github.com/cakephp/datasources )
2009-12-13 23:53:20 -05:00
Joël Perras
7b1ccfff57
Changing error handler to send a HTTP/1.1 500 error when missingTable, missingDatabase or missingConnection is encountered. Increased test coverage of libs/error.php to 100%. Fixes #70 .
2009-12-13 23:53:19 -05:00
Joël Perras
96c245c6a7
Moving list of http codes out of Controller::redirect() and into a new method, Controller::httpCodes() for better reusability. See doc blocks for usage details.
2009-12-13 18:04:55 -05:00
Mark Story
02330b2d9c
Making DboSource::fields() accept an expression object. Fixes issues with sql parsing over quoting special SQL syntax.
...
Tests added
Fixes #66
2009-12-13 15:52:07 -05:00
Joël Perras
25ec51d3ae
Merge branch '1.3' into 1.3-misc
2009-12-13 15:42:13 -05:00
Mark Story
47a9401d43
Adding test case for cached view files, and fatal errors caused by the view instance not being registered. View instances are now registered when rendering view caches, and unregistered if the cached view fails. This fixes issues rendering flash messages with custom layouts and fixes FormHelper methods inside nocache blocks.
...
Fixes #60
2009-12-13 12:39:39 -05:00
Mark Story
904b9f5f1c
Adding test and fix to ensure the debug = 0, log = false leaves error_reporting set to 0.
...
Fixes #89
2009-12-11 00:46:13 -05:00
Mark Story
6615094350
Merge branch '1.3' into 1.3-misc
2009-12-10 23:42:55 -05:00
Mark Story
f26d5efd0c
Applying patch from 'kleingeist'. JsHelper::set() now generates a variable that is assigned to window.$var instead of creating a local variable by default.
...
Tests updated.
Fixes #96
2009-12-10 23:37:55 -05:00
José Lorenzo Rodríguez
c65e2f3f18
Quoting virtual fields in automatically
...
Updating test cases
2009-12-10 20:46:55 -04:30
José Lorenzo Rodríguez
8c4cad86c2
Fixing erroris due to bad rebase
2009-12-10 20:35:24 -04:30
José Lorenzo Rodríguez
e7ee5e9eda
Fixing faling test case
2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
7a7d0de988
Adding support for virtual fields in DboSourse::calculate
2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
d06ff5d10a
Adding support for virtual fields in conditions array
2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
cf359a38b3
Re-adding ability to order by virtual fields in DboSource::order
...
Adding support for paginating virtual model fields in controller
2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
051d352eab
Reimplementing DboSource::order() to avoid recursion so it can be more easily manipulated to add virtual fields (and hopefully to make it a little bit faster)
2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
5a58813031
Making DboSource order by virtual fields
2009-12-10 20:08:13 -04:30
José Lorenzo Rodríguez
7efafc685e
Fixing virtual fields fetching for Model::field() calls
...
Adding doc blocks
2009-12-10 20:08:13 -04:30
José Lorenzo Rodríguez
a81edb6080
Extending virtual fields implementation to work on queries with field list
2009-12-10 20:07:46 -04:30
José Lorenzo Rodríguez
53765312df
Initial implementation of model virtual fields
2009-12-10 20:07:07 -04:30
José Lorenzo Rodríguez
2503632327
Working on virtual fields on order clause.
2009-12-10 20:05:10 -04:30
José Lorenzo Rodríguez
ec672e99e8
Fixing virtual fields fetching for Model::field() calls
...
Adding doc blocks
2009-12-10 20:05:10 -04:30
José Lorenzo Rodríguez
00c0bb4d62
Extending virtual fields implementation to work on queries with field list
2009-12-10 20:01:58 -04:30
José Lorenzo Rodríguez
19c91f1f70
Initial implementation of model virtual fields
2009-12-10 20:01:58 -04:30
predominant
df151395c5
Moving certain datasources to the Datasources Plugin ( http://github.com/cakephp/datasources )
2009-12-11 01:07:23 +11:00
Mark Story
ecea49f823
Updating AuthComponent's mapped actions features to use Router::prefixes()
...
Adding tests for prefix interactions.
Adding tests for AuthComponent::logout, increasing code coverage.
2009-12-09 00:25:21 -05:00
Mark Story
76780ab99c
Updating uses of Routing.admin to be Routing.prefixes, as Routing.admin is deprecated.
2009-12-08 23:52:02 -05:00
Mark Story
f8a406e9fa
Removing dead test case, its covered by the CakeRoute tests.
2009-12-08 23:10:51 -05:00
Mark Story
de7658e78b
Modifying FormHelper::create() and FormHelper::secure() to use hidden divs instead of hidden fieldsets. This improves the semantics of FormHelper and allows generated html to more easily pass HTML4.0 validation.
...
Test cases updated.
2009-12-08 22:58:08 -05:00
Mark Story
7c2cdb1fb4
Adding tests to Xml::toString to disprove #395
2009-12-08 22:00:55 -05:00
Mark Story
17777af3d3
Adding test case, and removing unreachable code.
2009-12-08 21:43:29 -05:00
Mark Story
4421fe6dc3
Fixing issues in router where plugin => null would not always exit a plugin route. Test cases added.
2009-12-08 21:36:25 -05:00
Mark Story
efa36abdf0
Fixing double merging of url options in paginator helper. This was causing duplicate passed url parameters in next()/prev().
...
Test cases added.
Fixes #391
2009-12-08 10:01:33 -05:00
predominant
c64389006d
Removing "Long description for file" from /cake/tests tree.
2009-12-08 20:19:42 +11:00
ADmad
e2c4c0d4de
Removed adding of Html and Form helper by default to baked controllers as its not DRY and they are alrady inherited from Controller class. If var helpers is declared in AppController, Html and Form should be included there.
2009-12-08 01:41:52 +05:30
mark_story
24b636cc71
Merge branch 'mergers' into 1.2-merger
...
Conflicts:
cake/libs/view/helpers/text.php
cake/tests/cases/libs/view/helpers/text.test.php
2009-12-06 22:03:17 -05:00
mark_story
1f5c6eac2e
Fixing issues in tests caused by overwritten columns.
...
Fixing issue where mysqli had errors using getCharsetName, moving DboMysqlBase::getCharset down to DboMysql.
2009-12-06 21:46:05 -05:00
mark_story
7259a1b920
Merge branch '1.2' into 1.2-merger
...
Conflicts:
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/helpers/text.php
cake/libs/view/theme.php
2009-12-06 21:43:53 -05:00
mark_story
b3b9ae39e3
Fixing failing tests in View::uuid() caused by changes to trailing / in Router::url()
2009-12-06 21:21:07 -05:00
mark_story
360810a1cf
Merge branch '1.3-router' into mergers
2009-12-06 21:11:47 -05:00
mark_story
bbb61b28f7
Merge branch '1.3-misc' into mergers
2009-12-06 21:11:26 -05:00
mark_story
4cefb5fbd0
Applying patch from kleingeist to fix Js->value incorrectly calling Helper::value()
2009-12-06 20:45:12 -05:00
mark_story
cc750d15f1
Adding test to disprove #385 . Proves saveAll with validate => first behaves correctly.
2009-12-04 14:39:12 -05:00
mark_story
0047ac8f34
Renaming RouterRoute to CakeRoute
2009-12-03 21:20:08 -05:00
mark_story
8c4d389760
Implementing the ability to use custom Route classes when connecting routes. Tests added.
2009-12-03 20:50:13 -05:00
mark_story
aff7d61277
Merge branch '1.3-misc' into 1.3-router
2009-12-03 19:13:28 -05:00
AD7six
9cd7888991
removing reference to unused variable __bare
2009-12-03 21:33:56 +01:00
mark_story
3b74c93582
Changing how helpers are extracted, fixes issues with view variables not overwriting local helper variables. Fixes #381
2009-12-03 09:55:49 -05:00
mark_story
0806545f35
Adding passthrough to localized Validation class for Validation::ssn. Tests added. Fixes #378
2009-12-02 20:57:14 -05:00
mark_story
16f6d4d408
Making the various SecurityComponent::requireXX methods accept a single array or a list of strings as their arguments. Unifies the use of these functions with AuthComponent. Fixes #354
2009-12-02 17:56:52 -05:00
mark_story
0b13e3d5b9
Removing whitespace.
2009-12-02 11:37:43 -05:00
Phally
324b479b1c
Refactored test case.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-02 11:23:17 -05:00
Phally
bb92a47ddb
Added support for numeric values in expectation of assertTags().
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-02 09:10:56 -05:00
mark_story
494875cca2
Renaming RouterRouter::$params to $options.
2009-12-02 00:20:51 -05:00
mark_story
e741e0e4cb
Adding test for previously broken reverse routing feature, where parameters that only partially passed the pattern would be accepted.
2009-12-01 15:04:53 -05:00
mark_story
21dd7fd4ca
Fixing connection of plugin routes, the were being connected in the wrong spot.
...
Moving admin route + plugin tests to correct place.
Fixing order of methods in tests. parse() should only be called after routes are connected otherwise the default routes will precede the custom routes.
2009-12-01 14:39:23 -05:00
mark_story
a5a02925d8
Adding test for previous commit.
2009-12-01 13:38:32 -05:00
mark_story
a8f79f9fe5
Removing defaults that are also keys this makes the actions with the default index key work much better. Also things can't be both a variable and a constant routing parameter.
2009-12-01 13:37:03 -05:00
mark_story
0293a840c5
Adding test to disprove #368 . FormHelper::year() is working correctly and includes model name in the input name attribute.
2009-11-30 13:43:26 -05:00
mark_story
393038816c
More tests passing in RouterTest now.
2009-11-30 10:15:39 -05:00
mark_story
cd46f4db2e
Fixing function signature of ThemeView constructor. Fixes issues where ThemeView would always be registered causing issues with EmailComponent and themed views. Fixes #370
2009-11-30 09:19:25 -05:00
mark_story
11dd7898c4
Fixing tests + adding tests for passed args order preservation when passed args are part of default route parameters.
2009-11-30 00:23:41 -05:00
mark_story
e41c408378
Adding parameter pattern matching back into RouterRoute::match(), fixes failing tests in RouterRoute test case.
2009-11-29 23:46:02 -05:00
mark_story
5999264f10
Most of RouterRoute::match() working now. Failing tests for params with patterns included.
2009-11-29 22:57:10 -05:00
mark_story
de0b90db4a
Moving addition of plugin and controller keys to Router instead of RouterRoute.
2009-11-29 16:21:33 -05:00
mark_story
9e9559b350
Working on RouterRoute::match(). Adding tests for RouterRoute::match() and removing defaults from routes that don't need defaults.
2009-11-29 16:09:45 -05:00
mark_story
b242dc9531
Moving parameter persist to RouterRoute.
...
Tests updated.
2009-11-29 10:59:38 -05:00
mark_story
f59b8daf2e
Expanding tests for passed arguments in route defaults working correctly. Refactoring passed arguments in route default handling.
2009-11-29 09:49:19 -05:00
mark_story
889e367510
Expanding and correcting doc block for router::connect.
2009-11-28 23:37:40 -05:00
mark_story
5b4d15dc3b
Removing support for mid route * elements. Mid-route lazy * behaved in a sometimes erratic fashion making routes employing mid-route lazy * hard to depend on.
2009-11-28 21:54:33 -05:00
mark_story
33c67f7c47
More tests passing and more code moved from Router to RouterRoute. Switching RouterRoute to used named capture groups. This simplifies the route processing internals as there are fewer loops used to merge array sets together.
2009-11-28 09:40:15 -05:00
mark_story
4cb055ff0a
Removing tests for features no longer supported. Path elements containing only regular expressions are no longer supported. They did not effectively reverse route. And they provided an inconsistent behavior when combined with the full gamut of regular expressions and routing parameters.
2009-11-27 17:12:35 -05:00
mark_story
26aa3731e0
Fixing _name_ elements being inserted into serialized xml from Xml lib. Test case added. Fixes #367
2009-11-27 14:27:32 -05:00
phpnut
8bc84948f0
Adding more tests for theme assets
2009-11-27 10:27:15 -06:00
mark_story
49c6cd3f9f
Fixing issues with optional parameters. Allows route params to be made optional by setting a pattern definition.
2009-11-27 09:58:51 -05:00
phpnut
43fdde2dad
Removing unneeded code in Dispatcher::cached();
...
Fixing path search for themes
2009-11-27 00:49:20 -06:00
mark_story
fd98bc5d76
Expanding tests on Router and RouterRoute.
2009-11-26 23:46:42 -05:00
mark_story
feb0dec970
Starting tests for RouterRouter::parse()
2009-11-26 23:01:54 -05:00
mark_story
89d0ed8f3b
Route compilation tests passing again.
2009-11-26 21:42:33 -05:00
phpnut
903a1fd95a
Adding new Configure::$App['www_root']
...
Helper::webroot(); will now check for theme assets in APP/webroot/theme/<theme_name>/
Adding ico key to Media::$mimeType;
Fixed bug in previous commits that would not use views/themed/<theme_name>/layouts/ from a plugin
Adding test cases for Helper::webroot();
Adding more tests for ThemeView.
2009-11-26 14:52:38 -06:00
mark_story
3907893263
Adding tests for incorrect function used in form.ctp.
...
Fixing mistyped function name. Fixes #364
2009-11-26 09:52:15 -05:00
mark_story
c4ceeabcf5
More tests and more passing tests for Route compilation.
...
Basic route compiling complete.
2009-11-26 09:41:05 -05:00
mark_story
6661c2fa70
Starting to refactor RouterRoute::_writeRoute
2009-11-26 00:17:43 -05:00
phpnut
f83a024a10
Increasing code coverage for View and ThemeView
2009-11-25 23:17:15 -06:00
phpnut
948f6b21e5
Refactored last commit changes are:
...
To override plugin views with a themed version of the view you would create:
<app_name>/views/themed/<theme_name>/plugins/<plugin_name>/<controller_name>/*.ctp
To override plugin views at the app view level you would create:
<app_name>/views/plugins/<plugin_name>/<controller_name>/*.ctp
2009-11-25 22:58:02 -06:00
mark_story
0b9ae92eb9
Adding a test case for RouterRoute to increase code coverage.
2009-11-25 23:51:27 -05:00
mark_story
1d7881b16f
Renaming connectDefaults to defaults().
...
Updating tests.
2009-11-25 23:39:07 -05:00
phpnut
21eb001a96
Refactoring themes/views to use a centralized location instead of allowing plugins to have themes.
...
The plugin should include all required views/assets, to override these at the application level using themes you would create:
<app_name>/views/themed/<theme_name>/<plugin_name>/<controller_name>/*.ctp
if you are not using themes you can override them at the app view level:
<app_name>/views/<plugin_name>/<controller_name>/*.ctp
2009-11-25 22:29:54 -06:00
mark_story
52264cb61c
Fixing persistent param route exiting.
...
Adding test for exiting persist param routes.
2009-11-25 23:12:48 -05:00
mark_story
35fac165b3
Merge branch '1.3-misc' into 1.3-router
...
Conflicts:
cake/libs/router.php
2009-11-25 22:57:42 -05:00
mark_story
dc769041f3
Updating project task test case to reflect changes in skel dir.
2009-11-25 22:52:33 -05:00
mark_story
dd4fbbab45
Updating PluginTask to create webroot dir and no longer create vendors/css, vendors/js and vendors/img
2009-11-25 22:50:50 -05:00
mark_story
e345b2f788
Merge branch '1.3' of dev@code.cakephp.org:cakephp into 1.3-misc
2009-11-25 22:23:38 -05: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
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
3b1256cefb
Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc
2009-11-24 22:10:11 -05:00
dogmatic
53bfc8cca2
a new take on toList and more tests for passing a different separator
2009-11-24 22:00:33 -05:00
dogmatic
398113f828
fixes Text::toList to allow passing array( 1=>"abc", 2=>"abc" ) and the updated test case
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-24 20:27:56 -05:00
dogmatic
51d0805ce0
fixes Text::toList to allow passing array( 1=>"abc", 2=>"abc" ) and the updated test case
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-24 20:23:23 -05:00
mark_story
c94702506d
Fixing fails in Set::reverse caused by _log property being removed from Object.
2009-11-22 21:31:44 -05:00
mark_story
8cdee90b4f
Merge branch '1.3-misc' into 1.3-merger
...
Conflicts:
cake/libs/view/helpers/html.php
2009-11-22 21:28:14 -05: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
ceeram
cd6fd74caf
Added -empty flag for ProjectTask to bake with empty dir files, tests included
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-22 18:18:14 -05:00
mark_story
2e0acbf505
Making habtm join conditions used by __saveMulti when finding link records to remove. It should be noted that having conditions on non-joinTable tables, and not having a model on the joinTable can cause SQL issues. Fixes #304
2009-11-22 17:56:46 -05:00
mark_story
6c3bcdd7e6
Removing commented code.
2009-11-22 17:34:11 -05:00
Juan Basso
c6c7474502
Fix test of the size of lines in MagicDb (included test for it).
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-22 12:27:57 -05:00
mark_story
6b3b2a629b
Removing CakeSession::__validateKeys() its no longer needed due to CakeSession using Set to manipulate the session values. Adding test case for exploit shown in https://trac.cakephp.org/ticket/2041
2009-11-21 20:44:35 -05:00
mark_story
a729fc4d62
Merge branch '1.3-cache' into 1.3-misc
2009-11-21 17:16:38 -05:00
mark_story
c11509483c
Removing use of Helper::output from core helpers.
...
Removing duplicated test caused by merge in form helper test.
2009-11-21 16:43:54 -05:00
mark_story
d37dd4c49f
Updating doc block for FileEngine.
...
Fixing Cache::set() so strtotime compatible durations are handled properly.
Restoring previous change in Xcache test case.
2009-11-21 16:09:06 -05:00
mark_story
fb7d99e6b3
Making XcacheTest use refactored Cache API.
2009-11-21 15:44:03 -05:00
mark_story
3f067ed166
Updating ApcEngine test to use the new Cache engine api.
2009-11-21 15:26:17 -05:00
mark_story
5ff2e66f75
Updating memcache test to use new Cache api.
...
Removing most private access in the test case.
2009-11-21 15:26:17 -05:00
mark_story
266cddb4db
Removing whitespace.
2009-11-21 15:26:16 -05:00
mark_story
4b184ceccb
Updating FileEngine test to use new Cache api methods.
2009-11-21 15:26:16 -05:00
mark_story
14d643ff99
Fixing File cache test to run with modified Cache API.
2009-11-21 15:26:16 -05:00
mark_story
95f8ed5b55
Additional refactoring and code removal.
2009-11-21 15:26:16 -05:00
mark_story
0ba622bb0e
Removing debug changes.
...
Updating isInitialized() to its new use.
Refactoring Cache engines to no longer be singletons with heavy settings manipulation. Instead each config() is a separate instance.
2009-11-21 15:26:16 -05:00
mark_story
3404f1ed39
Adding documentation to Cache::config().
...
Adding tests for default configuration manipulation of config().
2009-11-21 15:26:16 -05:00
mark_story
b1c89496c5
Fixing typo in Cache doc block.
...
Updating formatting in Xcache doc block.
Fixing Xcache test case so it passes when username and password are not user & password.
2009-11-21 15:19:11 -05:00
Juan Basso
71df8dbbba
Replace function sizeof (alias) by count.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:50:57 -05:00
burzum
67cea6d21c
Fixing a problem with setting Paginator::sort() defaults directon to desc
2009-11-17 02:11:23 +01:00
Jippi
e6801c22e1
Merge branch '1.3' of code.cakephp.org:cakephp into 1.3
2009-11-16 23:19:11 +00:00
Jippi
2cb0c3acb3
Changed SessionHelper::flash to return message instead of echoing it
2009-11-16 23:15:24 +00:00
mark_story
aa97daeea9
Updating test due to merge conflicts.
2009-11-15 20:09:35 -05:00
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
a292ef0f16
Adding ability to provide default plugin value to pluginSplit().
2009-11-15 19:54:33 -05:00
mark_story
20a114a1cd
Adding $dotAppend to pluginSplit()
2009-11-15 19:12:00 -05:00
mark_story
db0c030557
Adding pluginSplit and test case. pluginSplit consolidates a number of repeated code blocks.
2009-11-15 18:16:12 -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