Commit graph

9624 commits

Author SHA1 Message Date
mark_story
11d20f80d0 Fixing failing tests imported with the merge. 2011-02-05 15:24:53 -05:00
mark_story
e149c411fb Merge branch '1.3' into merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/console/shells/tasks/template.php
	cake/dispatcher.php
	cake/libs/controller/component.php
	cake/libs/controller/components/email.php
	cake/libs/controller/scaffold.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	cake/tests/fixtures/datatype_fixture.php
2011-02-05 12:20:09 -05:00
mark_story
8d5e68d582 Fixing issue where habtm tables would not have the connection prefix removed when generating schema. Fixes #1180 2011-02-05 11:19:05 -05:00
mark_story
ca22624b2b Tiny tweak to remove a duplicated line. 2011-02-05 10:43:30 -05:00
mark_story
79bbd227e3 Cache::configured() and in_array() are faster than calling Cache::config() 6 times. 2011-02-05 10:30:28 -05:00
mark_story
cf50cbdd9d Fixing issue in FormHelper where CURRENT_TIMESTAMP or other invalid data could cause a notice error. Fixes #1508 2011-02-05 06:43:00 -05:00
mark_story
0a266fa1fc Fixing typo. 2011-02-05 05:54:38 -05:00
mark_story
f58f3763eb Updating tests to account for attribute whitespace change. 2011-02-05 05:52:18 -05:00
mark_story
8f66fe6ed4 Removing additional spaces in tags. 2011-02-05 01:48:52 -05:00
mark_story
f5383a2243 Fixing some failing tests. 2011-02-05 01:40:14 -05:00
mark_story
8d7df1721c Removing duplicate import. 2011-02-05 01:29:35 -05:00
mark_story
304f12d0ed Removing a pointless import in CakeRequest.
Moving inclusion of ObjectCollection to bootstrap.  This avoids repetitive calls to import()
2011-02-05 01:28:41 -05:00
mark_story
8e267f7be2 Fixing bake's unit test detection so it checks for PHPUnit properly.
Fixes #1505
2011-02-04 21:56:24 -05:00
Mark Story
7b34d879dc Making exception class names visible in the WebTest runner. Fixes #1506 2011-02-04 17:11:49 -05:00
mark_story
63308fdbd8 Fixing issue where a false id would be appended to the route url. Test added. Fixes #1501 2011-02-02 21:52:41 -05:00
Phally
f3812342c2 Minor optimization for email linefeeds. 2011-01-31 00:15:56 +01:00
Phally
9402f0ab79 Added missing skipIf when no SMTP server is running. 2011-01-31 00:06:11 +01:00
mark_story
6db8515e60 Fixing incorrectly nested sprintf + __ call. Refs #1305 2011-01-30 12:25:40 -05:00
mark_story
5b8499c8c7 Adding $name back in as it causes numerous notice errors in fixtures when it is missing. 2011-01-29 20:54:15 -05:00
ADmad
88d5db76fd Removed overriding of recursive to 0 in Model::_findNeighbors() if 'recusive' option is not specified in find options. Closes #860 2011-01-30 04:13:01 +05:30
Maggion Emmanuel
01801a7777 Reducing code related to CakeSchema. Fixes #1477 2011-01-29 17:26:08 -05:00
mark_story
b30f40582e Making SchemaShell disable the cache when reading table information for schema generation. Fixes #1490 2011-01-29 09:24:28 -05:00
Jeremy Harris
3575053463 Merge remote branch 'upstream/2.0' into 2.0 2011-01-27 18:33:07 -08:00
Jeremy Harris
e99f090ee0 Fixed issue where ClassRegistry alias was incorrectly set 2011-01-27 18:32:51 -08:00
Juan Basso
bbf6aedd9c Fixed wrong viewVars store when have objects in view caching. Fixes #1486. 2011-01-28 00:31:18 -02:00
mark_story
5464ed8455 Fixing blackholes caused by using custom name attributes with inputs. Fixes #1489 2011-01-27 21:05:30 -05:00
mark_story
38e286e978 Fixing order of paths so core paths are last in the search array. Fixes #1488 2011-01-27 19:30:21 -05:00
mark_story
71d8e744f1 Fixing case-sensitivity of AS in fields. Tests added. Fixes #1474 2011-01-26 20:58:16 -05:00
mark_story
d192ed32f0 Adding a socket key to DboMysqli::$baseConfig. Fixes notice errors when socket is undefined. Fixes #1482 2011-01-26 20:54:14 -05:00
ADmad
161d3ea5fb Removed from comments references to DBOs which are no longer available. Closes #1479 2011-01-26 19:34:42 +05:30
Juan Basso
95713fbf3b Separated the tests for HtmlHelper::loadConfig() with exception in different methods. 2011-01-25 01:18:44 -02:00
mark_story
32f0b20a33 Removing wonky and most likely incorrect manipulation of socket and port
setting mangling in DboMysqli.  Fixes #1478
2011-01-24 22:05:16 -05:00
Juan Basso
dc4357f636 Merge remote branch 'jrbasso/2.0-html' into 2.0 2011-01-23 21:25:02 -02:00
Juan Basso
d933d6bd73 Assigning the helper object in view class, avoiding to use __get magic for each call. 2011-01-23 20:51:56 -02:00
Juan Basso
be98491413 Ini/Php readers now read files with/without extension. 2011-01-23 20:27:46 -02:00
mark_story
7032729651 Fixing how webroot is calculated for installs not using url rewriting. Also fixes using the top level index.php file.
Test cases added for using both index.php files.
Cleaned up existing tests for environment detection.
Fixes #1261, Fixes #1432
2011-01-23 17:08:09 -05:00
Juan Basso
5b8f680d43 Throwing exception instead notice in loadConfig. 2011-01-23 20:00:06 -02:00
Juan Basso
55c557d5a1 Support to read ini files without section in IniReader. 2011-01-23 19:28:57 -02:00
Juan Basso
175e008308 Reading configuration using reader classes. You can pass the key configFile in Html settings to load in constructor. 2011-01-23 19:27:50 -02:00
Juan Basso
1a90bf7292 Support to read ini files without section in IniReader. 2011-01-23 19:26:13 -02:00
Juan Basso
7df9782020 Moving loadConfig to Html helper. 2011-01-23 16:21:17 -02:00
Juan Basso
b1f4c6a0c9 Changed tags attributes to protected. 2011-01-23 12:38:36 -02:00
Juan Basso
10d3dd5d2b Moving the parseAttributes to Html helper. 2011-01-23 12:36:14 -02:00
Juan Basso
5bc0f0c2a1 Replacing sprintf using Html tags by useTag. 2011-01-23 12:26:14 -02:00
Juan Basso
8cd54776f1 Created the method useTag in html, avoiding sprintf with Html tags in others helpers. 2011-01-23 12:25:52 -02:00
Juan Basso
41e1aa7ece Support to html5 in docType. 2011-01-23 11:05:51 -02:00
Jeremy Harris
c970770c8d Merge remote branch 'upstream/2.0' into 2.0 2011-01-21 15:09:06 -08:00
Jeremy Harris
68799c9828 Removed unnecessary imports and ensured model import. Fixes #1453 2011-01-21 15:08:37 -08:00
mark_story
3747e395f1 Fixing notice errors caused by garbage urls being fed into Dispatcher.
Added a test.
Fixes #1463
2011-01-21 16:02:33 -05:00
Joe Beeson
e58e3f3132 Fix to resolve 'assign by reference' errors when using a '__get' magic method.
Fixes #1476

Signed-off-by: mark_story <mark@mark-story.com>
2011-01-21 15:52:03 -05:00