phpBB Ascraeus

• 

  Andreas Fischer <bantu@phpbb.com> 20 Jan 2015 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
• 

  Andreas Fischer <bantu@phpbb.com> 20 Jan 2015 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.
• 

  Andreas Fischer <bantu@phpbb.com> 20 Jan 2015 6e00529f368784df4e1aebdcee6e55ae0babbe65

  Merge branch 'develop-olympus' into develop-ascraeus
  * develop-olympus:
    [ticket/13526] Correctly validate the ucp_pm_options form key.
• 

  Andreas Fischer <bantu@phpbb.com> 20 Jan 2015 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.
• 

  Andreas Fischer <bantu@phpbb.com> 20 Jan 2015 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
• 

  Andreas Fischer <bantu@phpbb.com> 20 Jan 2015 3134b6b70e55e2f75f14c61b273e6c0673d0411d

  Merge pull request #3306 from marc1706/ticket/13519
  [ticket/13519] Correctly validate imagick path as path and not string
  
  * marc1706/ticket/13519:
    [ticket/13519] Correctly validate imagick path as path and not string
• 

  Andreas Fischer <bantu@phpbb.com> 20 Jan 2015 92b5222295d6d1a8f49fe688a822922f8372b7d2

  [ticket/13527] Apply htmlspecialchars() to data from version server.
  PHPBB3-13527

  • phpBB/includes/acp/acp_update.php (version 92b5222295d6d1a8f49fe688a822922f8372b7d2)
• 

  Andreas Fischer <bantu@phpbb.com> 20 Jan 2015 251868dd7e22c510a44ecd01150dff308e0fceae

  [ticket/13527] Remove two unused variables.
  PHPBB3-13527

  • phpBB/includes/acp/acp_update.php (version 251868dd7e22c510a44ecd01150dff308e0fceae)
• 

  Joas Schilling 20 Jan 2015 23069a13e203985ab124d1139e8de74b12778449

  [ticket/13526] Correctly validate the ucp_pm_options form key.
  PHPBB3-13526

  • phpBB/includes/ucp/ucp_pm_options.php (version 23069a13e203985ab124d1139e8de74b12778449)
• 

  Marc 19 Jan 2015 6564446b0f14b88e540e2b1b5fe72fe4082d5573

  [ticket/13519] Correctly validate imagick path as path and not string
  PHPBB3-13519

  • phpBB/includes/acp/acp_attachments.php (version 6564446b0f14b88e540e2b1b5fe72fe4082d5573)