Review main Merged

10494[BUGFIX] Prevent encoding of HTML entities in backend previews

Sascha Egerer CR +2 V +2 Easy +3 −3 updated 06/03/13, 20:49

Commit message

HTML entities that are used in HTML enabled fields should
be preserved for the preview instead of being encoded (twice).

Review

  • Code review CR +2
    • Oliver Hader +2
    • Stefan Neufeind +1
    • Markus Klein +1
    • Helmut Hummel +1
  • Verified V +2
    • Oliver Hader +2
    • Stefan Neufeind +1
    • Markus Klein +1
    • Helmut Hummel +1

Files 2

Review log 44

Show 19 earlier messages
  1. Stefan Neufeind commented on patch set 1 03/12/13, 15:50

    Looks good to me, but someone else must approve
  2. Markus Klein commented on patch set 1 03/12/13, 15:50

    Verified; Looks good to me, but someone else must approve

    class.tx_cms_layout.php:1752

    Pay attention in backports that UTF-8 here is only valid for master!
  3. Dmitry Dulepov commented on patch set 2 03/12/13, 15:50

    Looks good to me, but someone else must approve
  4. Stefan Neufeind commented on patch set 2 03/12/13, 15:50

    Looks good to me, but someone else must approve
  5. Stefan Neufeind commented on patch set 3 03/12/13, 15:50

    (1 inline comment) can't / won't vote since I rebased it :-) But would be great to hear from others.
  6. Stefan Neufeind uploaded patch set 3 03/12/13, 15:50

  7. Stefan Neufeind commented on patch set 3 03/12/13, 15:50

    (1 inline comment) hand-rebased had 2x verified, 4x review
  8. Markus Klein uploaded patch set 2 03/12/13, 15:50

  9. Markus Klein commented on patch set 2 1 comment 03/12/13, 15:50

    Verified; Looks good to me, but someone else must approve
  10. Markus Klein commented on patch set 3 03/12/13, 15:50

    Verified; Looks good to me, but someone else must approve Reapplying vote
  11. Sascha Egerer commented on patch set 4 03/12/13, 15:50

    ping
  12. Stefan Neufeind commented on patch set 4 03/12/13, 15:50

    Would be really great to get this long-standing topic done (reviewed by core-devs) and resolved ...
  13. Stefan Neufeind commented on patch set 4 03/12/13, 15:50

    Looks good to me, but someone else must approve
  14. Markus Klein uploaded patch set 4 03/12/13, 15:50

  15. Markus Klein commented on patch set 4 03/12/13, 15:50

    (1 inline comment)
  16. Markus Klein commented on patch set 4 1 comment 03/12/13, 15:50

    Verified; Looks good to me, but someone else must approve
  17. Helmut Hummel commented on patch set 1 03/12/13, 15:50

    Should be easy to add unit tests for this one. Please do so. Thanks.
  18. Helmut Hummel commented on patch set 4 2 comments 03/12/13, 15:50

    I would prefer that you didn't submit this I would oppose backporting this change. Other than that, a short google search https://www.google.de/search?q=html_entity_decode+security does not reveal any critical stuff (for current PHP versions), but it does not make me fee confident that we should use this method at all. Instead I would rather check, if supplying the fourth parameter to htmlspecialchars would do a better job for our usecase. This would also mean that a backport is technically impossible as this only works since PHP 5.3
  19. Helmut Hummel uploaded patch set 5 03/12/13, 15:50

  1. Helmut Hummel uploaded patch set 6 03/12/13, 15:50

  2. Helmut Hummel commented on patch set 6 03/12/13, 15:50

    Verified; Looks good to me, but someone else must approve I'm totally fine if it goes in like that, but only in master for now.
  3. Stefan Neufeind commented on patch set 7 03/12/13, 15:50

    Verified; Looks good to me, but someone else must approve
  4. Markus Klein commented on patch set 7 03/12/13, 15:50

    Verified; Looks good to me, but someone else must approve
  5. Oliver Hader commented on patch set 7 03/12/13, 15:50

    Looks good to me, but someone else must approve
  6. Oliver Hader commented on patch set 7 03/12/13, 15:50

    Looks good to me, approved
  7. Helmut Hummel uploaded patch set 7 03/12/13, 15:50

  8. Helmut Hummel commented on patch set 7 03/12/13, 15:50

    Verified; Looks good to me, but someone else must approve
  9. Georg Ringer commented on patch set 1 03/12/13, 15:50

    (1 inline comment)

    PageLayoutView.php:1613 Reply

    we don'T need to backport*everything*!

    class.tx_cms_layout.php:1752 Reply

    IMO this needs to be nl2br(htmlspecialchars(trim(html_entity_decode($this->wordWrapper($input),ENT_COMPAT | ENT_,'UTF-8')))); as utf-8 is not always default and this would lead to strange chars out of  
  10. Georg Ringer commented on patch set 1 03/12/13, 15:50

    will add the tests
  11. Georg Ringer commented on patch set 4 1 comment 03/12/13, 15:50

    Verified; Looks good to me, but someone else must approve
  12. Reinhard Führicht commented on patch set 4 03/12/13, 15:50

    Verified; Looks good to me, but someone else must approve
  13. Philipp Gampe commented on patch set 1 03/12/13, 15:50

    Verified; Looks good to me, but someone else must approve
  14. Philipp Gampe commented on patch set 2 03/12/13, 15:50

    Verified; Looks good to me, but someone else must approve
  15. Philipp Gampe commented on patch set 4 03/12/13, 15:50

    Verified; Looks good to me, but someone else must approve
  16. Mr. Jenkins commented on patch set 2 03/12/13, 15:50

  17. Mr. Jenkins commented on patch set 3 03/12/13, 15:50

  18. Mr. Jenkins commented on patch set 4 03/12/13, 15:50

  19. Mr. Jenkins commented on patch set 5 03/12/13, 15:50

  20. Mr. Jenkins commented on patch set 6 03/12/13, 15:50

  21. Mr. Jenkins commented on patch set 7 03/12/13, 15:50

  22. Wouter Wolters commented on patch set 4 03/12/13, 15:50

    please merge
  23. Wouter Wolters commented on patch set 4 03/12/13, 15:50

    Looks good to me, but someone else must approve
  24. Oliver Hader commented on patch set 7 V 0 03/12/13, 15:50

    by team member
  25. Oliver Hader merged patch set 8 03/12/13, 15:50