mark_story
ceca179184
Fixing more tests that were failing post merge.
2010-12-10 23:17:42 -05:00
mark_story
1e108748e9
Fixing validation methods + features lost in [ f51ce734
] due to a bad
...
merge.
Fixing additional tests to reflect changes in 2.0
2010-12-10 22:52:22 -05:00
mark_story
b9f0fc0724
Merge branch '1.3' into merger
...
Conflicts:
cake/dispatcher.php
cake/libs/cake_session.php
cake/libs/controller/components/cookie.php
cake/libs/controller/components/email.php
cake/libs/controller/controller.php
cake/libs/controller/scaffold.php
cake/libs/set.php
cake/libs/validation.php
cake/libs/view/view.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/validation.test.php
cake/tests/cases/libs/view/view.test.php
2010-12-10 22:24:31 -05:00
Juan Basso
d97103d739
Making the format attribute customizable in helpers.
2010-12-10 02:42:38 -02:00
Graham Weldon
0deaa6eee0
Update basics test for debug() changes.
2010-12-10 15:39:50 +11:00
mark_story
1548b7badb
Expanding and correcting the doc block for ObjectCollection.
2010-12-09 23:22:08 -05:00
mark_story
d7e62b88bc
Adding test cases for using helpers in nested elements from email
...
templates. Closes #1355
2010-12-09 22:34:20 -05:00
mark_story
a830632071
Changing View::element() to not overwrite viewVars with helpers that
...
have the same name.
Test added.
Fixes #1354
2010-12-09 22:06:23 -05:00
Graham Weldon
e9907cb9da
Made debug() output html-safe strings by default.
2010-12-10 12:53:45 +11:00
Graham Weldon
33d2f9a6ed
Refs #621 . Provides default maxLimit for pagination to prevent url manipulation causing long queries.
2010-12-10 12:22:12 +11:00
jblotus
48f32a11e0
Fixed incorrect docblock. Fixes #1350
...
Signed-off-by: mark_story <mark@mark-story.com>
2010-12-08 22:08:43 -05:00
mark_story
8681399fc2
Forcing the plugin list to use a fresh directory listing in the web runner. Fixes #1338
2010-12-06 21:29:11 -05:00
mark_story
c096eea664
Fixing failing tests caused by constants changing.
2010-12-05 23:32:34 -05:00
mark_story
55e06ec244
Merge branch '2.0-config' into 2.0
...
Conflicts:
cake/libs/configure.php
2010-12-05 23:00:05 -05:00
mark_story
0ec1e65013
Removing collisions that prevent TestTask from being loaded.
2010-12-05 22:53:29 -05:00
Jeremy Harris
8a7e2609cd
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2010-12-05 17:57:44 -08:00
Jeremy Harris
5eab027b84
Removed unnecessary pass by references
2010-12-05 17:28:15 -08:00
José Lorenzo Rodríguez
c559b9c22d
Merge remote branch 'origin/2.0' into 2.0
...
Conflicts:
cake/console/templates/skel/config/database.php.default
cake/libs/model/datasources/dbo/dbo_sqlite.php
2010-12-05 20:51:37 -04:30
José Lorenzo Rodríguez
847e775d8f
Merge remote branch 'origin/2.0-pdo' into 2.0
2010-12-05 20:48:26 -04:30
mark_story
7024d14c74
Removing private annotations for File::__construct() and File::__destruct() as its just not true. This also prevents them from being included in the API docs.
2010-12-05 18:41:26 -05:00
mark_story
5f47de7658
Adding @package tags.
...
Moving MissingModelException with the other exceptions.
2010-12-05 00:02:20 -05:00
mark_story
ad80609841
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2010-12-04 23:55:49 -05:00
mark_story
d202ea643d
Fixing issue loading plugin models when uses == false.
2010-12-04 23:49:00 -05:00
mark_story
9dd78c7dc1
Updating Multibyte class to use new Configure api.
2010-12-04 22:59:07 -05:00
mark_story
5ad8d8af41
Adding a parameter to configured() to allow you to check if a particular config has been configured.
2010-12-04 22:57:33 -05:00
Juan Basso
c52d5320c8
Replaced the *printf with i18n aliases by i18n aliases with params.
2010-12-04 23:37:13 -02:00
Juan Basso
30661ed154
Support to vsprintf in i18n aliases (__*() functions).
2010-12-04 23:34:59 -02:00
mark_story
0b18fc25a6
Changing some requires so things run smoother.
2010-12-04 17:53:57 -05:00
mark_story
ba63a2948c
Fixing failing test caused by additional trailing space.
2010-12-04 17:49:09 -05:00
mark_story
b49c4402e5
Implementing store and restore for Configure.
...
Test cases added.
2010-12-04 17:26:59 -05:00
Juan Basso
f4d4811c96
Fixed wrong documentation.
2010-12-04 20:19:17 -02:00
mark_story
539f2cd785
Removing a cakeError that slipped through the cracks.
2010-12-04 16:34:20 -05:00
mark_story
94258e14d7
Doing some reformatting and removing calls to read() since we are already in Configure.
2010-12-04 16:29:34 -05:00
mark_story
af768c0b6f
Removing non-existant databases from comments.
2010-12-04 15:04:21 -05:00
mark_story
0cf02ec2f9
Fixing issues caused by CORE_PATH not being reliable.
2010-12-04 15:00:48 -05:00
mark_story
ae814db2dd
Changing IniAcl to use IniReader.
2010-12-04 14:47:47 -05:00
mark_story
8031d33d33
Fixing more E_STRICT notices and adding a type check to DboSource::dropSchema().
2010-12-04 14:37:02 -05:00
mark_story
a6c5065e9c
Fixing a few more E_STRICT errors in postgres test/class.
2010-12-04 14:31:11 -05:00
mark_story
843f5c6190
Fixing E_STRICT error in ConsoleErrorHandler.
2010-12-04 14:20:50 -05:00
mark_story
7e29859676
Fixing E_STRICT errors in test models.
2010-12-04 14:19:53 -05:00
mark_story
7e3c98024e
Removing reference operators in ModelBehavior.
2010-12-04 14:19:36 -05:00
mark_story
18fb12c95c
Removing & pass by ref operators as they aren't needed any more.
...
Fixing a bunch of E_STRICT errors.
2010-12-04 14:15:32 -05:00
mark_story
64d1f799f8
Adding fixtures that fixed MissingTableExceptions I was getting.
2010-12-04 13:52:38 -05:00
mark_story
d13759522b
Removing strtolower() calls. You must now call model magic findBy and findAllBy using camelcase forms.
2010-12-04 13:45:42 -05:00
mark_story
466137485d
Removing a duplicated property.
...
Changing is_a() to instanceof as it marginally faster.
Adding a comment to getConnection as it was missing it.
Minor optimization to a regular expression.
2010-12-04 13:28:43 -05:00
mark_story
159f25ff0f
Adding ini file and more tests for types.
2010-12-04 12:58:02 -05:00
mark_story
98704d3ecd
Adding nested value support to IniReader.
...
Adding boolean conversions.
Adding test cases.
2010-12-04 12:56:37 -05:00
mark_story
26980c23ba
Adding file that was omitted from previous commits.
2010-12-04 12:56:13 -05:00
mark_story
1e569f509a
Changing IniFile to be a ConfigReader for use with Configure. Test case updated.
2010-12-04 12:15:47 -05:00
mark_story
9e32c13cac
Updating doc blocks.
2010-12-04 10:41:23 -05:00