Andreas Fischer <bantu@phpbb.com>
d0e5c0a1871c37bfea780cc525e996749b13a0ee
d0e5c0a1871c37bfea780cc525e996749b13a0ee
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/13527] Apply htmlspecialchars() to data from version server.
[ticket/13527] Remove two unused variables.
Conflicts:
phpBB/includes/acp/acp_update.php
20 Jan 2015
Andreas Fischer <bantu@phpbb.com>
d17904884ea27905d85c8cdc395821ade7079fa2
d17904884ea27905d85c8cdc395821ade7079fa2
Merge pull request #3312 from bantu/ticket/13527
[ticket/13527] Escape information received from version server
* bantu/ticket/13527:
[ticket/13527] Apply htmlspecialchars() to data from version server.
[ticket/13527] Remove two unused variables.
20 Jan 2015
Andreas Fischer <bantu@phpbb.com>
6e00529f368784df4e1aebdcee6e55ae0babbe65
6e00529f368784df4e1aebdcee6e55ae0babbe65
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/13526] Correctly validate the ucp_pm_options form key.
20 Jan 2015
Andreas Fischer <bantu@phpbb.com>
a8027c542f267f8d04db89cc6cf54999cb1b53c1
a8027c542f267f8d04db89cc6cf54999cb1b53c1
Merge pull request #3311 from bantu/ticket/13526
[ticket/13526] Correctly validate the ucp_pm_options form key.
* bantu/ticket/13526:
[ticket/13526] Correctly validate the ucp_pm_options form key.
20 Jan 2015
Andreas Fischer <bantu@phpbb.com>
4d0b04a397e79f368ec0762d64c068e382c2eb21
4d0b04a397e79f368ec0762d64c068e382c2eb21
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/13519] Correctly validate imagick path as path and not string
Conflicts:
phpBB/includes/acp/acp_attachments.php
20 Jan 2015