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
6fdaa82969
Merge branch '1.3' into 1.3-merger
2009-11-22 21:26:39 -05:00
mark_story
f28b3c6efd
Fixing failing tests on ModelIntegrationTest related to with keys with bound fields set not retaining the fields set.
2009-11-22 21:26:25 -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
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
AD7six
4f3852618f
correcting $this -> $self
...
removing debug code
2009-11-22 19:58:10 +01: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
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
63b047eb57
Replacing extract with classicExtract.
2009-11-21 20:25:45 -05:00
mark_story
4ea2a3f37d
Minor optimization on importing of Cache engines.
2009-11-21 20:05:19 -05:00
mark_story
fa0d0addf8
Making it so Cache::__loadEngine is only called once per classname.
2009-11-21 20:01:33 -05:00
mark_story
46b965edba
Refactoring Configure::read/Configure::write so keys with <= 2 keys read/write faster.
2009-11-21 19:57:04 -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
e3e02bfcee
Fixing drop()
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
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
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
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
predominant
a91108a81a
Adding version check to getCharsetName() for MySQL Datasource.
2009-11-16 13:49:52 +11: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
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