Jose Lorenzo Rodriguez
2c5cb1157f
Merge branch '2.1-alltests' into 2.1
2012-01-12 20:13:58 -04:30
Jose Lorenzo Rodriguez
e25867da79
Catching any possible exception in DatabaseSession destructor, using exceptions in destructors is a bad idea in PHP
2012-01-12 20:12:38 -04:30
Jose Lorenzo Rodriguez
205064f11e
Merge remote-tracking branch 'origin/2.1' into 2.1
2012-01-12 19:14:50 -04:30
Jose Lorenzo Rodriguez
e6e14a7ff9
Fixing php 5.2 specific problem, closes #2468
2012-01-12 19:13:56 -04:30
Ceeram
eaf6f0e2c1
add missing App::uses()
2012-01-12 18:01:27 +01:00
Ceeram
9c652e6573
add missing tests
2012-01-12 13:06:24 +01:00
Ceeram
9f40e6de79
move AppShell to app/Console/Command directory
2012-01-12 11:55:10 +01:00
AD7six
7414d0f77b
rename set::getValue to set::get - and make it public
2012-01-12 09:45:28 +01:00
Matthew Lanigan
0e607bf880
$action in AclShell::_getParams() defaults to '*', not NULL
2012-01-11 21:59:58 -05:00
mark_story
97ce118294
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Utility/ClassRegistry.php
2012-01-11 20:59:31 -05:00
Jose Lorenzo Rodriguez
1a741b853b
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-11 21:26:12 -04:30
Jose Lorenzo Rodriguez
c53f0e6877
Explicitly casting to string a variable that could in times be either string or integer
2012-01-11 21:25:22 -04:30
mark_story
4d73f4e6a1
Fix boundaries used in multi-part messages.
...
Inline attachments should use the multipart/related boundary. Otherwise
sections will be incorrectly nested.
Fixes #2413
2012-01-11 20:44:42 -05:00
Hans-Joachim Michl
29cfdb4b41
Fixed wrong boundary marker for inline-files, inline-files should start new rel-boundaries, not (outer-)mixed-boundaries.
...
Amavis spits out this error:
X-Amavis-Alert: BAD HEADER MIME error: error: unexpected end of parts before epilogue
2012-01-11 20:30:49 -05:00
mark_story
0f8e1500de
Ensure helpers are loaded in data views.
...
Both XmlView and JsonView should load helpers when
they use view files.
Fixes #2465
2012-01-11 20:21:56 -05:00
José Lorenzo Rodríguez
c168677257
Merge pull request #401 from starlocke/2.0-2467
...
2.0 2467
2012-01-11 14:38:37 -08:00
Victor Yap
cf8c1cd93b
Return length 36 for uuid columns in Postgres.describe()
...
When describing a Postgres native "uuid" column, the length 36 should be
returned so that Model.save() will be able to correctly set $isUUID as
"true" on that column.
Fixes #2467
2012-01-11 17:27:39 -05:00
mark_story
32cb416ad7
Replace smart quotes with ASCII equivalents.
...
Fixes #2466
2012-01-11 13:38:50 -05:00
mark_story
aeda986745
Add additional empty() for tablePrefix.
...
Fixes compatibility issues with plugins that worked correctly in
previous point releases.
Fixes #2462
2012-01-10 21:01:03 -05:00
mark_story
7877e7f997
Make allow(null) and deny(null) consistent with no args.
...
No arguments and a single null should be handled the same.
Fixes #2461
2012-01-10 20:32:12 -05:00
mark_story
a8bc916104
Move check out of the loop, and allow nulls.
...
Refs #2341
2012-01-10 20:15:59 -05:00
AD7six
941d503726
documentation clarification
2012-01-10 10:52:07 +01:00
AD7six
a62c5350b3
whitespace
2012-01-10 10:51:06 +01:00
AD7six
d5fdf45e51
add a test for what happens when you nest on a field that doesn't exist
2012-01-10 10:49:17 +01:00
AD7six
3b1dd82603
add tests for set nest method
2012-01-10 10:18:59 +01:00
AD7six
d534013570
reduce code repetition
2012-01-10 09:47:51 +01:00
mark_story
d238d8c0bb
Fix incorrect __isset()
.
...
There was a missing $ before name. Fixes issues
with dynamic properties not being handled correctly.
Fixes #2450
2012-01-09 21:47:57 -05:00
mark_story
dbea15650b
Add iPad to the list of mobile clients.
...
Fixes #2452
2012-01-09 21:33:13 -05:00
AD7six
5608d63541
allow set nest to work with any-d arrays
...
not just model-formatted arrays
2012-01-10 01:24:20 +01:00
AD7six
442d889f99
move the paths used into options
2012-01-10 00:48:36 +01:00
AD7six
7b640b8123
move find threaded logic to the set class
2012-01-10 00:24:38 +01:00
AD7six
b8598c5ca0
Ensure the class has a constructor
...
if there is no constructor (this means a model which does not inherit
from Model) newInstance will throw an exception.
Conflicts:
lib/Cake/Utility/ClassRegistry.php
2012-01-09 23:42:09 +01:00
AD7six
336c750b7e
Ensure the class has a constructor
...
if there is no constructor (this means a model which does not inherit
from Model) newInstance will throw an exception.
2012-01-09 23:38:32 +01:00
ADmad
0be71a08d6
Adding / updating I18n class test cases.
2012-01-10 01:46:19 +05:30
ADmad
30522d0219
Adding $language parameter to I18n::translate()
2012-01-10 00:51:48 +05:30
ADmad
08825e54b7
Replacing hardcoded default domain with static property I18n::$defaultDomain
2012-01-10 00:51:48 +05:30
ADmad
1f246d61ca
Refactoring I18n class to expose public methods to read .po, .mo and locale definition files.
2012-01-10 00:51:47 +05:30
mark_story
1ffde95239
Update version number to 2.1.0-alpha
2012-01-08 22:23:56 -05:00
mark_story
1bc4562f3a
Fix failing test in App.
2012-01-08 22:14:32 -05:00
mark_story
0e56d742b8
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/BehaviorCollection.php
lib/Cake/basics.php
2012-01-08 21:59:18 -05:00
mark_story
f4c27e04bc
Fix errors generated when option['order'] is undefined.
...
Fixes #2447
2012-01-08 21:55:51 -05:00
mark_story
3c48552f81
Fix error with more case-sensitive databases.
2012-01-08 21:40:12 -05:00
mark_story
c548b6b88a
Fix issue with find(count) and translated conditions.
...
Because count queries did not have joins created for the translated
fields pagination would generate invalid queries. Checking the conditions
for translated fields and adding in the correct joins solves that.
Extract what would have been duplicated code into methods.
Add a few protected properties to keep method signatures sane. The code
could be even simpler if the existing find(count) join was removed.
Fixes #2349
2012-01-08 20:40:25 -05:00
Jose Lorenzo Rodriguez
c029316a62
Merge branch '2.1-hiphop' into 2.1
2012-01-08 20:12:40 -04:30
Jose Lorenzo Rodriguez
850dbb9453
More explicit fetch mode in Mysql datasource
2012-01-08 18:46:42 -04:30
mark_story
9a67a70703
Fix failing test.
2012-01-07 20:24:33 -05:00
mark_story
79564fb7d4
Remove incorrect constant.
2012-01-07 20:10:14 -05:00
mark_story
90423dcfac
Add more verbose output to the various commands.
2012-01-07 20:05:51 -05:00
mark_story
1644b1c249
Fix a few problems with the build.xml
...
- Fix condition checking. Phing was barfing on the old 'code'
- Packages would always be made for the previous release. Fix that.
- Check return codes so we don't blunder ahead when things go wrong.
- Put in invalid data so accidents don't happen.
2012-01-07 20:05:12 -05:00
mark_story
2aa6822b32
Add other core members.
2012-01-07 20:05:12 -05:00