adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6726 commits 7 branches 0 tags 44 MiB
Commit graph

4150 commits

Author SHA1 Message Date
Mark Story
959befb6e1 Merge commit 'josezap/virtual-fields' into virtual-fields 2009-12-18 19:11:50 -05:00
Mark Story
6356c6ed87 Fixing issue where forms generated with requestAction would be missing the _Token fields that Security component creates. Test cases added to ensure that token key does not change when requestAction is used. 
Fixes #68
 2009-12-18 19:05:33 -05:00
José Lorenzo Rodríguez
8f29f59c1a Enclosing virtual fields in parentheses to avoid SQL errors 
Added new tests to improve  code coverage on virtual fields
 2009-12-17 14:42:46 -04:30
Mark Story
264cdb78c0 Removing unnecessary key. 2009-12-17 10:13:05 -05:00
Mark Story
b190e462b8 Fixing whitespacing. 2009-12-17 00:15:42 -05:00
Mark Story
e8f0ea951a Updating tests and doc blocks for JsHelper::writeBuffer() to return null if no scripts have been buffered. Fixes #108 2009-12-16 23:48:29 -05:00
kleingeist
2d9b13fe88 Prevent JsHelper::writeBuffer() to return empty lines (or empty onDomReady events) 
Signed-off-by: Mark Story <mark@mark-story.com>
 2009-12-16 23:36:40 -05:00
Mark Story
0bc1126114 Merge branch 'component-settings' into 1.3-misc 2009-12-16 23:08:16 -05:00
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
ff74a599c6 Adding ability to set configuration from initialize() for RequestHandler. 
Tests added.
 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
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
bbc72c3703 Updating use of deprecated split() to use preg_split(). 2009-12-16 21:08:15 -05:00
Mark Story
c8297ff283 Minor optimization on Inflector::variable 2009-12-16 19:23:29 -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
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
09966a7f63 Adding support for .ttf, .otf, .eot to MediaView. These are common font assets used with @font-face techniques. 2009-12-16 12:48:34 -05:00
Mark Story
4ac29963a8 Refactoring Model::__validateWithModels. Should be slightly faster as loops are smaller. 2009-12-15 22:55:34 -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
ADmad
33038c75ac Removing redundant 'isset' check from DboMysql::connect 2009-12-15 20:41:44 +05:30
ceeram
64045e1e18 Apply new Helper syntax to remaining files 
Signed-off-by: Mark Story <mark@mark-story.com>
 2009-12-14 18:52:13 -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
Joël Perras
86cba7dc50 Fixing wrong header message text for ErrorHandler::error500() header sent. Refs #70."" 2009-12-14 16:21:30 -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
predominant
d550a5e82c Code formatting cleanup. Fixes #92. 2009-12-13 23:53:20 -05:00
renan.saddam
b273981915 Checking for french error on dbo_mssql. Fixes #77. 2009-12-13 23:53:19 -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
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
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
4b9e03c9f7 Creating accesor methods for virtual fields and replacing direct access from DboSource with new methods 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
22e36cb057 Fixing bug where sometimes key($data[0]) returned empty string instead of first key in array 2009-12-10 20:08:12 -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
285329e7a4 Fake commit 2009-12-10 20:05:11 -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
0ab2078284 Changing Model::hasField() api to accept second parameter for checking existance of virtual field 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
4685daf299 Fixing bug where sometimes key($data[0]) returned empty string instead of first key in array 2009-12-10 20:05:10 -04:30
José Lorenzo Rodríguez
f7a113d2b0 Convertig old-style find call to new api 2009-12-10 20:01:58 -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
predominant
8df7e34965 Code formatting cleanup. Fixes #92. 2009-12-10 13:04:11 +11:00
renan.saddam
c3bf6bc0e8 Checking for french error on dbo_mssql. Fixes #77. 2009-12-09 21:20:55 -02:00
renan.saddam
931606f7f5 Checking for french error on dbo_mssql. Fixes #77. 2009-12-09 21:10:37 -02: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
6b657d9a9d Fixing failing tests due to incorrect merging. 2009-12-08 23:07:43 -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
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
13ffd76178 Removing "Long description for file" from /cake/libs tree. 2009-12-08 20:19:02 +11:00
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
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
626f2e86de Adding trigger_error for incorrect class use. 2009-12-03 21:29:02 -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
218af686d7 Renaming parameters. 2009-12-03 20:32:28 -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
be64f26f9f Updating doc blocks for model::validates. 2009-12-03 00:53:31 -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
cc1ba32f50 Removing call to RouterRoute::compile() 2009-12-02 01:10:50 -05:00
mark_story
61b70f1b44 Removing parameters from RouterRoute::_writeRoute(). 2009-12-02 00:26:43 -05:00
mark_story
494875cca2 Renaming RouterRouter::$params to $options. 2009-12-02 00:20:51 -05:00
mark_story
728613a34d Removing use of Set::filter() as its slowish. 2009-12-01 23:05:04 -05:00
mark_story
67ccac1f57 Adding omitted reference operator. 2009-12-01 22:31:18 -05:00
mark_story
63cd1a3326 Renaming method and removing Set::filter() call. 2009-12-01 22:21:33 -05:00
mark_story
78773020d1 Moving route failure handling to a separate method. 2009-12-01 21:56:03 -05:00
mark_story
4c175cc0bc Removing code. 2009-12-01 21:43:36 -05:00
mark_story
02ed766874 All tests passing in RouterTest. 2009-12-01 21:37:39 -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
e36631091d Fixing a failing test. 2009-12-01 14:58:36 -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
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
6046528744 Moving XmlNode::__killParent() to a protected method so Xml can access it. Adding _killParent(true) call to Xml::__destruct. Forces destruction of circular references held in child objects when an xml object is garbage collected. Fixes #369 2009-12-01 10:01:36 -05:00
mark_story
547ed839d9 Correcting constructor of MediaView to fix issues with viewVars not being set. 
Correcting use of MediaView in Dispatcher.  Fixes #366
 2009-12-01 09:50:27 -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
fccfe14e8d Expanding doc block for ClassRegistry. 2009-11-30 09:18:24 -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
0834cb47ab Removing code from RouterRoute::__mapRoute. All tests passing. 2009-11-29 12:10:09 -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
7216925394 Updating doc blocks. 2009-11-28 23:12:44 -05:00
mark_story
a86e414adc Removing Router::stripEscape() and all uses of it. 
Router::stripEscape() removed escape patterns supported in DboSource.  Since those escape patterns no longer exist, neither does the need for the escaping of those patterns.
 2009-11-28 23:08:52 -05:00
mark_story
d70689ecda Merge branch '1.3-misc' into write-route 2009-11-28 23:04:22 -05:00
mark_story
02f9275e20 Removing automagic -! sql no-escape string handling. Removing use of Router::stripEscape() from Dispatcher, as this method removed -! from url + post data. 2009-11-28 23:02:59 -05:00
mark_story
5cbe3dbd39 Removing unused variables. Making loop easier to read. 2009-11-28 21:58:02 -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
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
7b78e475ca Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-27 00:55:45 -06: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
89d0ed8f3b Route compilation tests passing again. 2009-11-26 21:42:33 -05:00
mark_story
8315b48e77 Removing String::getInstance() as it was causing fatal errors when eAccelerator was enabled, and is a deprecated method. 2009-11-26 18:24:14 -05:00
mark_story
18e0537869 Adding variable initialization 2009-11-26 17:50: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
ADmad
ad20e43730 Removing unneeded code for minor optimization 
Signed-off-by: Mark Story <mark@mark-story.com>
 2009-11-26 09:54:25 -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
3885466e9a Changing $_this to the easier to type $self. 2009-11-25 23:40:52 -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
636d944e70 Adding Router::connectDefaults(). Allows the developer to disable Router's automatic generation of routes. 2009-11-25 23:21:10 -05: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
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
0977029c89 Removing limit of image, js and css in plugins 2009-11-25 09:47:23 -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
64dffb7663 Moving shared method from DboMysqli and DboMysql up to DboMysqlBase. Fixes #358 2009-11-24 22:49:40 -05: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
mark_story
69b72083be Adding docblock and removing a call to array_slice() 2009-11-24 22:06:55 -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
58446e0785 Adding documentation note about $options['q'] Refs #357 2009-11-24 11:57:56 -05:00
mark_story
72c0e2ca5a Applying minor optimization from 'robustsolution' to Router::connectNamed(). 
Fixes #312
 2009-11-24 09:27:13 -05:00
mark_story
5aba143620 Applying optimization to Controller::postConditions from 'robustsolution' Fixes #287 2009-11-23 12:52:38 -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
6fdaa82969 Merge branch '1.3' into 1.3-merger 2009-11-22 21:26:39 -05:00