Fixed #018007: LDAP user and group strings are not escaped
Fixed #018970: Password in email
(cherry picked from commit 175e566650a5faf0664063a0e5517e9ec97ea799)
Fixed #18231: Infinite loop on transaction when mysql is gone away
(cherry picked from commit 5c8656a787a3010b8f3096f33d614fbf17b2352c)
Fixed #19336: flatten.php database timeouts leading to segmentation fault.
(cherry picked from commit ffb7805e00714c8695bc6d5deb0e9867781b1284)
- Implemented enhancement #16124: eZContentObjectTreeNode::createPermissionCheckingSQL() should define an index in temporary table

git-svn-id: file:///home/patrick.allaert/svn-git/ezp-repo/ezpublish/trunk@24893 a01eee8c-daba-0310-acae-fa49f3023285
(cherry picked from commit f132cee4163373a4a3321e4199ccd2a6976a35ed)
Fixed #15628: 5th argument of eZOperationHandler::execute is not handled
Fixed #19572: GET parameters lost in SSLZone based redirection
(cherry picked from commit 0cde9ea5ac3c9dc9fb1f2924937e731e332295b7)
(cherry picked from commit 8353199ac53f5b19029798350f0450fd26bbb0af)

Conflicts:

	kernel/classes/ezsslzone.php
Implemented #010827: Adding a CLI trash purge script
(cherry picked from commit 50684d25657776b95d961592ab90f78d02fdef1c)

Signed-off-by: André Rømcke <ar@ez.no>
Implement #010827: Adding a CLI trash purge script

Some more fixes by gl regarding uninitialized variables.
(cherry picked from commit c3dfa23798052ec7982c256cb9d216f276309618)
Fix eZ Publish user login cross site scripting (XSS) vulnerability

See:
http://share.ez.no/community-project/security-advisories/ezsa-2012-010-ez-publish-user-login-cross-site-scripting-xss-vulnerability

Conflicts:

	design/standard/templates/content/datatype/edit/ezuser.tpl

Conflicts:

	kernel/classes/datatypes/ezuser/ezusertype.php
Fixed XSS exploits caused by versionview

Conflicts:

	kernel/content/versionview.php
Fix #EZP-20037: XSS attack possible in content treemenu
(cherry picked from commit dbb1b83476e7f138059feef0091da27bed9a2719)
Fix #EZP-20038: XSS attack possible in content/browse
(cherry picked from commit 5ced93857a23fc19c6bd4755c9f6c4cc989e4c0e)
(cherry picked from commit 93985adfd7fb1a615e59ab0eb1dd158986268e8e)
(cherry picked from commit 0c0eb7129089db20867e4be2d4dc658208e502c2)
Fixed EZP-19836: log size declared in config.php fails to apply
(cherry picked from commit 5b7b71439761de8937785660f6300dac02a7a904)

Conflicts:

	lib/ezfile/classes/ezlog.php
	lib/ezutils/classes/ezdebug.php
(cherry picked from commit 11a505438c1e964058669337b95eed00eaad30dd)
Fixed EZP-20052 - Website spoofing attack possible on user/login (and other urls as well)
(cherry picked from commit 516801e6cbb99381487065ec0899e23ba939d5c2)
(cherry picked from commit b83120646ac3a09a0d26f3365bf3814315fd9d65)
(cherry picked from commit 78e0a5d8fa4e9c2f8c368f90897f7856f0cc7e60)

Conflicts:
	lib/ezutils/classes/ezmodule.php
(cherry picked from commit defa7c685f8f2c549f2a6c4f00bfb17c531928f1)
Merge pull request #436 from jeromegamez/issue_19629_image_aliases

Fixed #19629: ezcache.php -> purge: Always remove file from table ezimagefile, even if not available on file system(cherry picked from commit 0d5b9ac8fedaa41513247399bf2c00513699c988)

Conflicts:

	kernel/classes/datatypes/ezimage/ezimagealiashandler.php
(cherry picked from commit 3f70b99418d69aa88842fbd58cf426c375cfbf4b)

Conflicts:

	kernel/classes/datatypes/ezimage/ezimagealiashandler.php
Merge pull request #507 from patrickallaert/EZP-19684

Fixed EZP-19684: Search engine doesn't handle curly quotes correctly(cherry picked from commit e62f4e7e61c363ae0a7f0242ee38135d342d9ddc)

Conflicts:

	tests/tests/kernel/suite.php
(cherry picked from commit f8cb5faef0582f41d72182893957eada8b42bcd6)

Conflicts:

	kernel/search/plugins/ezsearchengine/ezsearchengine.php
	tests/tests/kernel/suite.php
EZP-20052: BC mode by default
(cherry picked from commit b9cec95e318288223ee373044b666f0892571d41)
Fixed EZP-19653 - 404 errors may lead to DDOS attacks
(cherry picked from commit 173aa695b6fa982ca87fa410a1241a9900b69c29)
Fixed EZP-19684: Search engine doesn't handle curly quotes correctly (part 2)
(cherry picked from commit d4d26519f7c02efa1a466bcb4724a32a060d0f83)

Conflicts:

	kernel/search/plugins/ezsearchengine/ezsearchengine.php