Commit graph

4718 commits

Author SHA1 Message Date
mark_story
82250efc3e Updating doc blocks for FormHelper::input() refs #735 2010-05-20 22:58:20 -04:00
mark_story
94ac914426 Changing Router::$__validExtensions so Router::extensions() always returns an array like the doc block says.
Updating test cases for PHPUnit.
2010-05-20 22:55:25 -04:00
mark_story
7cef278ce2 Fixing missing boolean return in Validation::cc()
Fixing Validation test case to pass under PHPUnit.
2010-05-20 22:30:47 -04:00
predominant
6a18b2bc1d Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/basics.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/sanitize.php
	cake/libs/validation.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
2010-05-20 12:22:04 +10:00
predominant
3a81a9e6f2 Remove unnecessary spaces. 2010-05-20 12:17:52 +10:00
Robert Sworder
385ceb434e When using Digest Authentication the passwords do not need to be md5 hashed. Removed incorrect comment.
Fixes #733

Signed-off-by: mark_story <mark@mark-story.com>
2010-05-18 22:19:33 -04:00
Juan Basso
a94b9ee95b Update various links. Closes #392 2010-05-18 22:15:13 -03:00
mark_story
3a60aa07de Fixing issues where setting jQueryObject did not affect request() and its connected methods.
Tests added.
Fixes #728
2010-05-17 18:25:50 -04:00
mark_story
4915645fb1 Applying patch from 'Daren Thomas' fixes issues where sorting on virtualFields did not work properly when using aliased sort link keys. Tests added. Fixes #680 2010-05-16 23:42:14 -04:00
Mark Story
353c600cd7 Removing unreachable code. Fixes #614 2010-05-13 23:38:26 -04:00
Mark Story
046c233a34 Adding Welsh to the supported lists of locales in l10n. Thanks to 'DanAbel' for the 'patch'. Fixes #714 2010-05-13 22:13:59 -04:00
José Lorenzo Rodríguez
8c3df122eb Merge commit 'lorenzo/2.0-phpunit' into 2.0-phpunit
Conflicts:
	cake/tests/lib/reporter/cake_html_reporter.php
	cake/tests/lib/test_manager.php
2010-05-12 23:58:56 -04:30
Mark Story
79839c07d2 Fixing issues where ModelBehavior::detach() would not detach behaviors when a plugin.name was provided. This change makes detach() work like attach(). Tests added. Fixes #711 2010-05-11 23:08:14 -04:00
Mark Story
6add43a4bc Fixing issue where id = null could cause SQL errors when saving more than one record with a null id. Fixes #675 2010-05-11 22:40:56 -04:00
ADmad
3539660cd0 Space is now properly added inbetween when 'asc'/'desc' class is appended to user defined css class in PaginatorHelper::sort. Fixes #710 2010-05-12 00:42:02 +05:30
Mark Story
6e355312bb Fixing issue where Config.timeout wouldn't correctly countdown when many quick requests were sent. 2010-05-11 00:39:10 -04:00
Richard Sbresny
b04a3f8514 Switched over to using the previously unused Security::inactiveMins() method for getting timeout modifiers
Signed-off-by: Mark Story <mark@mark-story.com>
2010-05-11 00:14:20 -04:00
Richard Sbresny
5cf08cbe92 Updated default values to reflect the static values previously set
Signed-off-by: Mark Story <mark@mark-story.com>
2010-05-11 00:12:15 -04:00
Richard Sbresny
c62ae5e48a Included timeout multiplier factor to be used not just inside a session start
Signed-off-by: Mark Story <mark@mark-story.com>
2010-05-11 00:11:44 -04:00
Richard Sbresny
a4950f6940 Updated session timeout calculations to use the security level from core.php as the multiplier.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-05-11 00:11:20 -04:00
Robert Sworder
ec10a01504 Changing home.ctp to remove references to 1.2. Fixes #705
Signed-off-by: Mark Story <mark@mark-story.com>
2010-05-10 23:48:12 -04:00
predominant
8f880731c6 Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
predominant
1ec220dac2 Removing closing PHP tags. 2010-05-11 08:07:49 +10:00
José Lorenzo Rodríguez
765de657e6 Fixing PaginatorHelperTest to be compatible with PHPUnit 2010-05-09 18:49:04 -04:30
Mark Story
1a7dce3af6 Updating DboMysql to fix an issue where virtualFields that were simple
aliases to fields on other tables would end up in the wrong place.
Tests added.  Fixes #655
2010-05-07 23:26:13 -04:00
Mark Story
0930b5c63c Adding more documentation for JsHelper::submit(). Closes #681 2010-05-07 21:26:44 -04:00
Mark Story
1c3415759a Fixing 'Only variables should be assigned by reference' errors in php4 in form helper. Fixes #643 2010-05-06 22:11:31 -04:00
Mark Story
1c1c511853 Changing how email validation methods are applied, to fix issues where getmxrr() exists but the domain being validated does not have MX records correctly configured. Fixes #634 2010-05-06 21:43:58 -04:00
predominant
719836c41d Updated doc block for added HTTP Status. 2010-05-05 10:09:47 +10:00
Mark Story
ce10c85367 Making Sanitize::stripScripts() to remove multi-line script and style blocks. Fixes #657 2010-05-03 22:33:20 -04:00
Mark Story
95dbae8acf Making RequestHandler component carry along a passed status code. This fixes issues where RequestHandler hijacks an redirect(). Fixes #658 2010-05-03 22:07:13 -04:00
predominant
87db966383 Remove PHP5 conditional statements. 2010-05-03 13:36:32 +10:00
predominant
c1eaa4b24c Fixed access and removed @access tags. 2010-05-03 13:28:09 +10:00
Mark Story
c48f6d6536 Fixing safe parameter from leaking into request() calls in JsHelper::submit() and JsHelper::link(). Fixes #656 2010-05-02 21:17:10 -04:00
Mark Story
adf604a966 Merge branch '1.3' into 2.0
Conflicts:
	cake/console/templates/default/actions/controller_actions.ctp
	cake/console/templates/default/views/form.ctp
	cake/console/templates/default/views/index.ctp
	cake/console/templates/default/views/view.ctp
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
2010-05-02 17:53:42 -04:00
ADmad
f386dca6d8 Controller::loadModel() now returns true when model is succesfully instantiated as stated in docblock. Added test case. 2010-05-02 05:34:38 +05:30
Mark Story
257665eb5b Updating doc blocks for bindModel and unbindModel, explaining that associations are only reset when find() is called. Refs #652 2010-05-01 17:37:23 -04:00
José Lorenzo Rodríguez
ad51115e12 Fixing bug where required class would be added to form fields when using single rule syntax in $validate even if allowEmpty is set to true
Closes #654
2010-04-30 16:42:59 -04:30
Mark Story
734e4fa87a Removing the conditional check around including custom session configuration files. This fixes issues where requestAction could cause loss of session settings, and improves the end developers ability to customize the session. Custom session files should ensure that classes/functions are conditionally declared. Fixes #374, #541 2010-04-29 21:40:12 -04:00
ADmad
afd67e534b Fixing parse error created in commit [6d092552e5]. Closes #647 2010-04-30 03:52:39 +05:30
Mark Story
6d092552e5 Updating bake templates and Scaffold to use less sprintf() and more complete sentences in i18n strings. This should make translations easier to do in a gender correct way. Fixes #210 2010-04-28 23:56:07 -04:00
José Lorenzo Rodríguez
a6f60c1abb Implementing cache lockig in FileEngine using SplFileObject 2010-04-29 00:44:17 +10:00
José Lorenzo Rodríguez
5dce79e424 First steps into removing internal usage of File and Folder class in favor of SPL equivalents 2010-04-29 00:44:04 +10:00
Mark Story
328c58635b Fixing inflection of words ending in analysis. Fixes #619 2010-04-27 23:03:37 -04:00
Mark Story
2fab47e740 Updating doc block for EmailComponent::send(). Fixes #633 2010-04-27 22:50:34 -04:00
Mark Story
bd485c77d3 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-27 22:42:54 -04:00
Mark Story
bb239e3816 Fixing parse error in php4 for MediaView. Also fixing undefined variable error in Dispatcher. Fixes #628 2010-04-27 22:42:33 -04:00
predominant
9243f6601a Merge remote branch 'markstory/2.0' into 2.0 2010-04-26 14:11:07 +10:00
predominant
b13a5c2862 Added access modifiers and static delcarations on Set class. 2010-04-26 12:45:56 +10:00
Mark Story
af6435ece8 Fixing issue where table name was not using fully qualified table names, causing issues with models using table prefixes. Tests added. Fixes #623 2010-04-25 00:22:57 -07:00
predominant
1c064788c5 Updated vesion numbers to 1.3.0 2010-04-25 14:27:29 +10:00
ADmad
46df1be384 Model::deleteAll() now returns false if the 'find' to fetch records ids returns false (in case of sql error). Closes #272 2010-04-25 02:34:18 +05:30
Mark Story
e0b4e3dd96 Merge branch '2.0' of git://github.com/predominant/cakephp1x into 2.0 2010-04-24 01:45:58 -07:00
Mark Story
9ddbd6f686 Removing dependancy on Object from CakeSocket. Making tests less dependant on having a network connection. 2010-04-23 21:41:20 -07:00
Mark Story
a17a38ddf4 Fixing fatal errors in View test.
Removing =& and making tests use instanceof instead of is_object()
2010-04-24 00:22:21 -04:00
Mark Story
c03974ebb2 Expanding documentation for Router::queryString(). 2010-04-24 00:21:17 -04:00
Mark Story
e111735905 Changing AclBase into AclInterface as it is now an interface.
Splitting the test case into separate test cases for each class.
2010-04-23 23:52:36 -04:00
Mark Story
523eda018e Deprecating AclComponent::revoke() and AclComponent::grant() they were simply aliases that create a larger API with no real benefit. 2010-04-23 23:14:55 -04:00
Mark Story
62982c57b4 Making AclComponent throw exceptions when it encounters an error.
Making AclBase an abstract class.
Adding AclComponent::adapter() for runtime modification of the Acl implementation.
Tests added, updated and fixed.
2010-04-23 23:03:51 -04:00
Mark Story
33a2907202 Adding CakeLogInterface and implementing it in core and test suite classes. The new interface is used for method detection instead of a hard method check. Making CakeLog throw exceptions instead of trigger errors when things go wrong. 2010-04-23 22:31:21 -04:00
Mark Story
35c8f9963a Adding @throws to methods that could throw exceptions. 2010-04-23 22:29:57 -04:00
Mark Story
4d4d9e78f8 Adding App::setObjects() as a temporary way to modify App's cache of plugins. This allows the DispatcherTest to successfully run. 2010-04-23 22:04:16 -04:00
Mark Story
d000a11e9b Removing params() from Sanitize. 2010-04-23 21:32:39 -04:00
Mark Story
84002687c8 Making Security a static class.
Fixing static access issues in test case.
2010-04-23 21:28:54 -04:00
Mark Story
33bfe0e5e2 Making Helper extend Object, this fixes issues where Helpers would not have dispatchMethod or requestAction available.
Correcting JsHelper::call__ into JsHelper::__call
Updating test cases to remove reference operators
2010-04-23 21:21:31 -04:00
Mark Story
bf566e1aad Fixing failing tests in PaginatorHelper and moving tests related to JsHelper interaction into a separate test method. 2010-04-23 21:10:23 -04:00
predominant
da3103379e Revert "Change URL Validation to use filter_var"
This reverts commit 4e53916021.
2010-04-24 11:01:07 +10:00
predominant
4e53916021 Change URL Validation to use filter_var 2010-04-24 10:56:14 +10:00
predominant
557a6343f9 Minor adjustment to ip validation variables. 2010-04-24 10:51:56 +10:00
Mark Story
c9f103432c Updating Model to use call_user_func_array instead of methods that were previously inherited from Object. 2010-04-23 20:47:40 -04:00
Mark Story
65ddc2b040 Fixing fatal errors caused by calling methods that no longer exist. 2010-04-23 20:45:13 -04:00
Mark Story
0fc106428a Adding exception tossing for invalid cacheengine configuration. 2010-04-23 20:41:29 -04:00
Mark Story
797fa0009a Making Router throw exceptions when invalid route classes are used for routes. 2010-04-23 20:22:02 -04:00
predominant
f65e481ebf Consoloidate duplicate regex strings in money() validation. 2010-04-23 17:04:25 +10:00
predominant
396c025529 Converted validation to use filter_var with ipv4/ipv6 separation matching 1.3 operation. 2010-04-23 16:55:04 +10:00
Mark Story
bc6b8e5dfd Fixing parameters from leaking into the script tag when calling JsHelper::submit(). Added test cases and refactored JsHelper::link(). Fixes #613 2010-04-23 00:04:15 -04:00
predominant
298b44a550 Removing Object extension on Validation. 2010-04-23 13:10:56 +10:00
predominant
4c769ea585 Typo fix in doc block. 2010-04-23 12:58:58 +10:00
predominant
f51ce734bf Import Validation from old 2.0 branch. 2010-04-23 12:53:47 +10:00
predominant
015872445b Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/console/libs/acl.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
2010-04-23 12:52:56 +10:00
kleingeist
6033fc70fa Documentation fix for XmlHelper::serialize
Signed-off-by: Mark Story <mark@mark-story.com>
2010-04-22 21:27:17 -04:00
José Lorenzo Rodríguez
fca070fe9e Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
* '1.3' of git@github.com:cakephp/cakephp1x:
  Adding tests for and fixing the behavior of `cake acl initdb` it now correctly delegates to SchemaShell.  Fixes #608
  Making TestTask not depend on Inflection rules for creating directory names,  refs #610
  Adding tests for Inflector::rules() clearing cached values.  Fixes #609
  Clear cache of pluralized, singularized and tableize when set rules.
2010-04-22 16:50:25 -04:30
José Lorenzo Rodríguez
65f01fa31c Fixing model introspection in FormHelper to better take in account realted models with aliased names 2010-04-22 16:37:15 -04:30
Juan Basso
bb0ff192f7 Clear cache of pluralized, singularized and tableize when set rules.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-04-21 22:48:56 -04:00
Mark Story
120fdd9045 Removing other uses of Routing.admin as it has been removed from Router. 2010-04-20 23:43:51 -04:00
Mark Story
a71a8a89b2 Removing support for Routing.admin. Use Routing.prefixes instead. 2010-04-20 23:40:13 -04:00
José Lorenzo Rodríguez
5ceb19304e Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3 2010-04-19 23:33:43 -04:30
José Lorenzo Rodríguez
e1c4b9696b Adding documentation on 'attributes' key for FormHelper::error 2010-04-19 23:32:58 -04:30
Mark Story
661c76802c Making singleton access use a class property. 2010-04-19 23:56:36 -04:00
José Lorenzo Rodríguez
23eea00a0b Fixing FormHelper::error to no add error names and messages as html attributes. Fixes #585
This introduces the special key 'attributes' to FormHelper::error() when passed in the second parameter
The contents of said key will be converted into html attributes for the error container tag
2010-04-19 23:25:57 -04:30
Mark Story
e92e212b8d Fixing Router's constructor.
Adding static visibility to Router methods.
Adding a method for testing Router extensions.
Router::mapResources() now returns the mapped resources
Fixing visibility issues in test cases.
2010-04-19 23:44:45 -04:00
Mark Story
029d2581af Fixing autoFields causing invalid SQL when cross database joins are being done. Tests added. Fixes #476 2010-04-19 22:39:07 -04:00
Mark Story
ea7b32347d Removing some of the singleton access in Debugger. 2010-04-19 00:15:56 -04:00
Mark Story
2bf9504cfb Removing inheritance from Object.
Adding missing visibility keywords, and adding static keywords.
Removing @tags.
2010-04-19 00:10:22 -04:00
Mark Story
c05c9857ac Removing exception throwing from CacheEngine::gc() and subclasses as it randomly caused errors when using one of the affected engines. 2010-04-19 00:04:34 -04:00
Mark Story
b7e4e46251 Removing lonely comment. 2010-04-18 01:17:01 -04:00
Mark Story
40e310c79b Adding a no-op constructor for Object. Fixes issues where numerous sub-classes break because of a missing constructor in Object. 2010-04-18 01:12:44 -04:00
Mark Story
146ec004eb Removing inheritance from Object. Constructor workarounds are no longer needed and Object methods are not used on these classes. 2010-04-18 01:12:00 -04:00
Mark Story
4f0a9c4dc1 Removing PHP4 constructor and __destruct workarounds. 2010-04-18 01:03:57 -04:00
Mark Story
9046083dc8 Removing Overloadable and Overloadable2 they are not needed in PHP5.
Removing inheritance and test cases related to Overloadable.
2010-04-18 01:02:39 -04:00
Mark Story
92289e59f7 Updating ApcEngine so it implements the missing method in the abstract class.. 2010-04-18 00:57:52 -04:00
Mark Story
8ea4475ac3 Removing extra call to unset(). 2010-04-18 00:53:52 -04:00
Mark Story
ca8110ad32 Updating MemcacheEngine to use exceptions and implement missing CacheEngine methods. 2010-04-18 00:46:19 -04:00
Mark Story
d7f16816e6 Adding translation to exceptions in FileEngine. 2010-04-18 00:45:45 -04:00
Mark Story
a886e13666 Making CacheEngine an abstract class, and updating FileEngine to include the not implemented methods. 2010-04-18 00:38:36 -04:00
Mark Story
9ae8b737dc Trimming trailing whitespace. 2010-04-17 13:05:26 -04:00
Mark Story
78f14401ca Fixing issue where using delivery = debug and not using sessions would cause a fatal error. send() will now return the contents that would get written into the session. Fixes #595 2010-04-17 12:27:50 -04:00
Mark Story
bb7cc60d3f Fixing parse error added in last commit :( 2010-04-17 02:13:22 -04:00
Mark Story
0f6e87cab8 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-17 02:10:58 -04:00
predominant
92215e1795 Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/libs/inflector.php
	cake/libs/view/helpers/text.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/view/helpers/time.test.php
2010-04-16 23:43:28 +10:00
predominant
23a22c73b7 Remove "not being used" comment from Model docblock. Fixes #590 2010-04-16 21:45:44 +10:00
predominant
c7fcaf995f Convert getMictime() php4 hack to microtime(true) 2010-04-16 02:58:28 +10:00
predominant
c98021dcd8 Converted views, router and security classes to new translation shotcut function use. 2010-04-16 02:20:15 +10:00
predominant
6bd9f0f05b Convert models, datasources and file/folders to new version of translation shortcut function. 2010-04-16 02:00:25 +10:00
predominant
2f8d30d2c0 Convert controllers and sockets to new formate for shorthand translation functions. 2010-04-16 01:52:49 +10:00
predominant
41fe51d4b9 Cache classes converted to new shortcut translation usage. 2010-04-16 01:45:34 +10:00
Mark Story
1fef9e4a78 Making Configure/App methods static, removing reference operators.
Removing deprecated methods.
2010-04-15 00:06:17 -04:00
Mark Story
23b75f4ed2 Moving private members/methods to protected.
Changing Cache methods/members to static.
Removing singleton access to Cache.
2010-04-14 23:56:44 -04:00
Mark Story
79eeb33e35 Fixing constructors
Adding method visibility.
Removing reference operators.
2010-04-14 22:56:51 -04:00
Mark Story
8ef2a82a89 minor optimization to save one call to Helper::model() when creating forms. 2010-04-14 21:00:00 -04:00
ADmad
99e5f4a49f Removing ampersand (&) from default transliteration map 2010-04-15 01:56:38 +05:30
Mark Story
dbe4747add Making static methods static. 2010-04-14 00:29:44 -04:00
Mark Story
f13e70b936 Changing object constructor.
Adding visibility keyword.
2010-04-14 00:25:14 -04:00
Mark Story
cd42047dd5 Making CakeLog a static class, removing PHP4 workarounds and no longer needed singleton. Removes CakeLog::getInstance() 2010-04-14 00:23:15 -04:00
Mark Story
c4d57bd6e7 Removing AjaxHelper and JavascriptHelper as they were deprecated in 1.3 and are replaced by JsHelper + HtmlHelper. 2010-04-14 00:13:33 -04:00
Mark Story
958578c746 Fixing magic method visibility on Helper. 2010-04-13 23:54:21 -04:00
José Lorenzo Rodríguez
0300fc1c31 If connection is aborted, now MediaView returns false after stopping the transfer 2010-04-13 16:55:22 -04:30
José Lorenzo Rodríguez
940ce8b06e Adding some test coverage on MediaView.
Now MediaView does not exit after successful render, closes #569
2010-04-13 16:44:14 -04:30
Mariano Iglesias
388bca4acd Fixing syntax error generated by last merge conflict 2010-04-13 15:46:12 -03:00
Mariano Iglesias
a6b83cdd93 Fixing issue where TextHelper::autoLinkUrls was failing on some expressions 2010-04-13 15:39:30 -03:00
José Lorenzo Rodríguez
9d2819970d Fixing schema generation for postgres. Now character varying without lenght is translated to "text", to avoid sql errors. Closes #564 2010-04-13 01:08:31 -04:30
Mark Story
e2b5470d19 Updating version numbers to 1.3.0-RC4 2010-04-12 22:27:18 -04:00
ADmad
baaae6cdb7 Minor optimization in TreeBehavior::getparentnode() to avoid fetching unneeded associated records. Closes #572 2010-04-12 22:57:31 +05:30
Mark Story
404401b4de Moving action modification when a prefix is detected so it affects all url arrays. Previously it was only applied to parameters in the current request. This fixes inconsistencies between request parameters and url parameters. Fixes #570 2010-04-11 23:13:18 -04:00
Mark Story
42bc252460 Fixing return value of CakeSession::__startSession(). Once headers were sent any further session objects would think that the session was not successfully started. Fixes issues in Helper group test. Also fixes #568 2010-04-11 11:41:10 -04:00
predominant
a4cf737947 Fixing access specified on DboSource. 2010-04-11 15:25:18 +10:00
Mark Story
e1253f0bb5 Including a plugin short route for prefixes as well. There were failing Dispatcher tests relying on this. 2010-04-10 21:12:48 -04:00
ADmad
f6525e054f Updating transliteration map used by Inflector::slug to preserve some of the older mappings as previous commit broke test cases 2010-04-11 04:42:58 +05:30
Hilton Gonçalves
c082ee6b9b Update Default transliteration map used for Inflector::slug
Makes slugging of uppercase characters more consistent with lower case
ones.
Fixes #560
2010-04-10 18:09:54 -04:00
Mark Story
6c357ee555 Adding tests from 'tfs' fixes inconsistencies in extracting elements with one path selector. Fixes #555 2010-04-10 16:57:50 -04:00
Mark Story
fbaabad6bb Fixing issues where route parameters that overlapped could cause route compilation errors. Tests added. Fixes #565 2010-04-10 11:17:24 -04:00
Matt Curry
1c5898d94b Don't get User model if not needed. Fixes #563
Signed-off-by: Mark Story <mark@mark-story.com>
2010-04-10 10:40:56 -04:00
predominant
60bb9a9b56 Spacing doc blocks. 2010-04-09 22:06:44 +10:00
predominant
52cdef900b Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/dispatcher.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/behaviors/containable.php
	cake/libs/model/behaviors/tree.php
	cake/libs/router.php
	cake/tests/cases/libs/validation.test.php
2010-04-09 22:05:00 +10:00
predominant
ea635d6bea Fix protected call for _build on CakeSchema, and associated references. 2010-04-09 20:41:28 +10:00
Mark Story
30e6c57a96 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-08 23:37:27 -04:00
Mark Story
c38249ac28 Updating HtmlHelper + JavascriptHelper to call assetTimestamp() after webroot(). This allows theme files in webroot/theme to be correctly timestamped.
Updating tests to reflect changes in behaviour. Fixes #244
2010-04-08 23:36:04 -04:00
predominant
59fb134455 Change private methods to specify access, and add proected on methods that missed mass updates. 2010-04-09 13:33:25 +10:00
predominant
19b66b8617 Change luhn validation to public. 2010-04-09 13:30:58 +10:00
predominant
1d39b93785 Change access modifier on _stop() to protected. 2010-04-09 13:24:23 +10:00