Commit graph

6247 commits

Author SHA1 Message Date
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
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
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
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
7e889d8495 Changing require_once to require for custom session handlers. If you are using a class to do your custom session handling you must include checks to prevent duplicate class errors. Fixes #324 2009-11-22 12:25:53 -05:00
mark_story
f038cb8ffb Updating default bake templates to exclude primary key input for all actions containing 'add'
Fixes #319
2009-11-21 21:10:31 -05:00
mark_story
a30aec99fd Applying patch from 'robustsolution' for optimization in Dispatcher::dispatch. Fixes #317 2009-11-21 21:00:15 -05:00
mark_story
5d25780b9b fixing typo. 2009-11-21 16:25:39 -05:00
mark_story
d1066bfeaf Updating FileLog to include File if it does not already exist, fixes possible fatal errors if log was written to during the bootstrap process. 2009-11-21 15:21:19 -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
mark_story
a96c157d94 Applying optimizations to use of count() from 'jrbasso' 2009-11-21 15:14:21 -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
Juan Basso
52fcabc96a Little optimization in redirect of controller.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:47:42 -05:00
Juan Basso
1cef0ac981 Little optimization in postConditions of controller.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:46:49 -05:00
Juan Basso
1c0c1bc9c7 Replace function split by explode when possible.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:45:04 -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
Juan Basso
df9e1e0bd1 Replace function join (alias) by implode.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:11 -05:00
Juan Basso
1acc60b04c Replace function die (alias) by exit.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:38:11 -05:00
Juan Basso
9b6b258fed Replace function is_integer (alias) by is_int.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:36:10 -05:00
mark_story
9dcac18b87 Adding commented Asset.timestamp block to core.php 2009-11-21 13:26:33 -05:00
renan.saddam
4a8808eb21 Removing the argument passed to mssql_get_last_message(), it does not accept any argument. 2009-11-19 16:35:29 -02:00
renan.saddam
a33bd1d144 Removing the argument passed to mssql_get_last_message(), it does not accept any argument. 2009-11-19 16:28:11 -02:00
predominant
97239f0259 Adding newline. 2009-11-18 22:28:03 +11:00
burzum
67cea6d21c Fixing a problem with setting Paginator::sort() defaults directon to desc 2009-11-17 02:11:23 +01:00
mark_story
9eb1950646 Removing duplicate condition check. Fixes #314 2009-11-16 20:10:08 -05:00
mark_story
925fda7ba6 Updating core layout, and skel layout to reflect changes in session->flash().
Updating skel layout to use $this->Helper.
2009-11-16 20:01:55 -05:00
Jippi
e6801c22e1 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-16 23:19:11 +00:00
Jippi
f078b0aeda Fixed Router::url() not being able to leave an URL with persist parameters 2009-11-16 23:16:49 +00:00
Jippi
2cb0c3acb3 Changed SessionHelper::flash to return message instead of echoing it 2009-11-16 23:15:24 +00:00
phpnut
cc11230925 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-16 10:14:35 -06:00
phpnut
7211541821 Removing 1024 char limit when using fgets() 2009-11-16 10:14:03 -06:00
mark_story
86ce1a941c Merge branch '1.3' of dev@code.cakephp.org:cakephp into 1.3 2009-11-16 10:09:33 -05:00
mark_story
89558dc4af Fixing issues with models using default inflected tables instead of their actual tables when detecting associations. Fixes #315 2009-11-16 09:24:52 -05:00
mark_story
ddb9f8924c Updating i18n shell to use updated schema shell api. 2009-11-16 09:12:41 -05:00
predominant
a91108a81a Adding version check to getCharsetName() for MySQL Datasource. 2009-11-16 13:49:52 +11: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
e2c7cda5d5 Adding deleted empty file back in. 2009-11-15 20:07:02 -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
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
mark_story
ea6e3dd076 Fixing issue with bake model <name> 2009-11-15 16:47:58 -05:00
mark_story
e1d60368f6 Adding missing reference operator. 2009-11-15 16:38:15 -05:00
mark_story
31102ad412 Adding tests for App::pluginPath that were omitted before. 2009-11-15 16:38:02 -05:00