If you attempt to reset a password without first providing Symphony with mailing information, correctly capture and show the error
make sure we still pass the entry id even if the data array is empty
Way easier to fix directly in entry, since prepareTableValue would require the same fix
Merge branch 'integration'
Introduce a new method, General::wrapInCDATAIfNeeded

Fix stupid inversion

Make it the default behavior for wrapInCDATA
Replace the cdata-ing by the new method

Use wrapInCDATA in email gateway
Merge branch 'master' into integration
Merge pull request #1846 from DeuxHuitHuit/cdata

Introduce a new method, `General::wrapInCDATAIfNeeded`
Merge pull request #1836 from DeuxHuitHuit/entry-id

Pass the `entry_id` consistently even if no data exists for the field.
Merge branch 'integration' of github.com:symphonycms/symphony-2 into integration
Implement changes discussed in #1821
Cherry-picked 4e54cabc5147e3b9e21d640627fd13a0bd3750c2
Made some changes to respect the old logic of the setAttachments method
Make sure all changes from 4e54cabc5147e3b9e21d640627fd13a0bd3750c2 were brought back
Added `Field->prepareAssociationsDrawerXMLElement` function
Update the upload field for the association drawer
Added the field-{type} class on the li tag in order to identify each related field types
Made a terrible mistake. Field in DB use _ not -
If a section is unsorted via ?unsort, then revert to sorting by Entry ID. Fixes #1858
Merge pull request #1866 from DeuxHuitHuit/entry_id

Made a terrible mistake. Fields in DB use `_` not `-`