Commit graph

17011 commits

Author SHA1 Message Date
ber clausen
e0c85a18bc Trivial continue. 2013-12-22 22:15:47 -02:00
ber clausen
4e70e44247 Parenthesis are preferred. 2013-12-22 22:10:37 -02:00
Mark
0142137d31 Merge pull request #2530 from bar/patch-1
Double rainbow.
2013-12-22 15:58:03 -08:00
ber clausen
98962806cd Double rainbow. 2013-12-22 21:47:19 -02:00
Mark Story
4e55aa43f0 Merge pull request #2523 from bar/2.5-dbosource
Update documentation and typehint.
2013-12-21 18:30:44 -08:00
Ber Clausen
f30b43b4c9 Update documentation and typehint. 2013-12-21 22:02:45 -03:00
mark_story
62e89734ab Throw exceptions from Hash::combine()
When the key + value counts do not match Hash should throw an exception.
Silently doing the wrong thing is generally not a good idea. While this
change could break existing applications, those applications were
probably behaving incorrectly anyways.

Fixes #2470
2013-12-21 17:46:05 -05:00
Mark Story
0c4a5c59e4 Merge pull request #2520 from bar/2.5-dbosource-read
Document and try to order part of ```DboSource```.
2013-12-21 14:04:29 -08:00
José Lorenzo Rodríguez
60d2ece035 Merge pull request #2506 from dereuromark/2.5-string
Correct tokenize for empty strings.
2013-12-21 10:31:52 -08:00
Ber Clausen
c15f7de164 Re-expose DboSource::fetchAssociated() for BC.
Internally use protected methods to fetch hasMany and hasAndBelongsToMany
associations.
2013-12-21 11:34:40 -03:00
Ber Clausen
5ccb77e25d Be consistent with the result set variable name. 2013-12-21 10:57:40 -03:00
Ber Clausen
0adc062cfa Process query only when needed. 2013-12-21 10:57:40 -03:00
Ber Clausen
422be67a03 Avoid recalculating whether the relationship is a self join. 2013-12-21 10:57:40 -03:00
Ber Clausen
86b69964ef Be more semantic with variable names.
Isue less loockups for deep arrays.
A bit of documentation added.
2013-12-21 10:57:40 -03:00
Ber Clausen
7a378c3b22 Conveniently fetch hasAndBelongsToMany associations from within a function (like hasMany).
Variable names should represent their values.
Remove unnecessary references.
2013-12-21 10:57:38 -03:00
Ber Clausen
60a8f0900b Get Model associations only when needed. 2013-12-21 10:49:22 -03:00
Ber Clausen
8355d32bb1 Be more semantic indicating that association fields must be empty. 2013-12-21 10:49:22 -03:00
Mark Story
99c8503578 Merge pull request #2518 from bar/2.5-dbosource-getconstraint
Document DboSource::getConstraint().
2013-12-21 05:43:52 -08:00
Mark Story
0bafb7c1b3 Merge pull request #2519 from bar/2.5-dbosource
Update documentation.
2013-12-21 05:40:48 -08:00
Ber Clausen
5860cd4b8e Still more documentation. 2013-12-21 07:04:45 -03:00
Ber Clausen
c5c8cb80ba Document DboSource::getConstraint().
Also, update the function signature (to be compliant with other
functions) and type hint $LinkModel.
2013-12-21 06:24:23 -03:00
Ber Clausen
09188cc3d0 More documentation. 2013-12-21 06:11:31 -03:00
Ber Clausen
c1cdf190e3 Add documentation. Strict check. 2013-12-21 05:41:23 -03:00
Ber Clausen
1bdb783f91 Update documentation. 2013-12-21 05:39:42 -03:00
mark_story
a7ecf44007 Deprecated scaffold and scaffoldview.
They have already been removed in 3.0, so mark them accordingly.
2013-12-20 14:16:44 -05:00
mark_story
7e5c0f7185 Merge branch 'master' into 2.5 2013-12-20 14:15:35 -05:00
mark_story
df4b978ce4 Clarify the docs for DboSource::fetchAll()
Refs #2508
2013-12-19 17:39:44 -05:00
mark_story
5bddc477a3 Fix incorrectly handled time values around 12:00:00
When using 12 hour formats & intervals, values around 12:00 were
incorrecly converted to midnight.

Fixes #2507
2013-12-19 17:36:27 -05:00
euromark
3ecce19732 Correct tokenize for empty strings. 2013-12-19 15:58:08 +01:00
José Lorenzo Rodríguez
dc52f0bc0e Merge pull request #2501 from zoghal/2.5-DispatcherFilter-settings
add DispatcherFilter Settings
2013-12-18 23:27:53 -08:00
Saleh Souzanchi
bbbf3076ab undo remove end line break 2013-12-19 00:36:20 +03:30
Mark Story
ca2fb6fcfc Merge pull request #2503 from dereuromark/master-string
Correct doc block
2013-12-18 09:27:00 -08:00
Mark Story
16237a8163 Merge pull request #2502 from okinaka/fix-postgres-for-bigint-primary-key
Fix Postgres for bigint primary key.
2013-12-18 09:26:21 -08:00
euromark
3100118a4e Correct doc block 2013-12-18 12:10:23 +01:00
OKINAKA Kenshin
3433e10fbd Fix Postgres for bigint primary key. 2013-12-18 14:58:18 +09:00
Saleh Souzanchi
4639d3597c add DispatcherFilter Settings 2013-12-18 06:54:27 +03:30
Mark Story
54a65f98da Merge pull request #2499 from ADmad/2.5-cakeemail
By default use filter_var() to valid email addresses in CakeEmail.
2013-12-17 16:52:23 -08:00
ADmad
49a9d24ca7 By default use filter_var() to valid email addresses in CakeEmail.
Refs #2477
2013-12-18 01:07:40 +05:30
mark_story
30e139412d Fix input type inference when type=>checkbox
FormHelper should not infer types when the explicit type is checkbox.
Instead the provided type should be used.

Fixes #2491
2013-12-16 23:26:20 -05:00
Mark Story
81d14e4f1a Merge pull request #2494 from bcrowe/hotfix-configTimezone
Add Configure timezone to bootstrap
2013-12-16 19:01:37 -08:00
Bryan Crowe
20faace775 Clean up grammar in Configure timezone in bootstrap 2013-12-16 21:59:29 -05:00
Bryan Crowe
3a7650ad9b Remove smart quotes from Configure timezone in bootstrap 2013-12-16 21:51:36 -05:00
Bryan Crowe
4b28254319 Fix whitespace error in Validation utility 2013-12-16 21:40:46 -05:00
mark_story
44b7d013ae Fix whitespace error. 2013-12-16 21:39:06 -05:00
Bryan Crowe
708d462bf9 Add Configure timezone to boostrap 2013-12-16 21:14:32 -05:00
mark_story
01be15d654 Don't always wipe a Model's _schema property when calling setSource()
Only wipe the internal schema cache if listSources() returned a useful
list of sources. Otherwise retain the old schema. This lets datasources
that don't implement listSources to be combined with models that define
static schema properties.

Fixes #2467
2013-12-16 14:42:21 -05:00
José Lorenzo Rodríguez
b5d7628cbf Merge pull request #2484 from ADmad/2.5-cookiecomponent
Revert change done in 11f543f1f2.
2013-12-15 07:32:12 -08:00
ADmad
27979286b2 Revert change done in 11f543f1f2.
The change is unneeded now as Security::encrypt() no longer throws exception
for falsey values.
2013-12-15 20:29:41 +05:30
José Lorenzo Rodríguez
bba3e78219 Merge pull request #2483 from ADmad/2.5-security
Don't throw exception when trying to encrypt falsey value.
2013-12-15 06:53:19 -08:00
ADmad
8a666fb37e Don't throw exception when trying to encrypt falsey value. 2013-12-15 19:28:56 +05:30