Review main Merged

7314[BUGFIX] Fix path check for custom RTE styles

Stefan Neufeind CR +2 V +2 Easy +6 −2 updated 06/03/13, 20:49

Commit message

Fix for #29899 introduced a check if the file holding
custom RTE CSS exists. However that path used was
wrong.

Review

  • Code review CR +2
    • Steffen Ritter +2
    • Stefan Neufeind +1
    • Julian Hofmann +1
    • Stanislas Rolland +1
  • Verified V +2
    • Steffen Ritter +2
    • Stefan Neufeind +1
    • Julian Hofmann +1
    • Stanislas Rolland +1

Issues 1

Files 1

Review log 24

  1. Stanislas Rolland commented on patch set 1 12/17/11, 15:43

    I would prefer that you didn't submit this See inline comment.

    class.tx_rtehtmlarea_base.php:453

    I think the error is on this line: $filename = should be $fileName =
  2. Stanislas Rolland commented on patch set 2 12/17/11, 15:43

    (1 inline comment)
  3. Stanislas Rolland uploaded patch set 2 12/17/11, 15:43

  4. Stefan Neufeind commented on patch set 1 12/17/11, 15:43

    Affects the releases 4.5.9 and 4.6.2 as of today (as well as master). How to test: * Create a fileadmin/rte.css * Add page-TS: RTE.default.contentCSS = fileadmin/rte.css * Try editing content in RTE -> falls back to default.css
  5. Stefan Neufeind commented on patch set 1 12/17/11, 15:43

    @Stanislas: It still won't work as the path is incorrect afterwards. Please see the forge-entry for some details and try it yourself.
  6. Markus Klein commented on patch set 2 12/17/11, 15:43

    (1 inline comment)

    class.tx_rtehtmlarea_base.php:456

    Why not merging the two ifs?
  7. Stanislas Rolland uploaded patch set 4 12/17/11, 15:43

  8. Markus Klein commented on patch set 3 12/17/11, 15:43

    Ok, will revert then.
  9. Markus Klein uploaded patch set 3 12/17/11, 15:43

  10. Stanislas Rolland commented on patch set 5 12/17/11, 15:43

    Verified; Looks good to me, but someone else must approve
  11. Stefan Neufeind commented on patch set 5 12/17/11, 15:43

    Verified; Looks good to me, but someone else must approve Stanislas: Thank you! Tested this with relative path as well as an EXT:...-path (both sysext and local ext). Works for me.
  12. Stefan Neufeind commented on patch set 5 12/17/11, 15:43

    (1 inline comment)
  13. Markus Klein commented on patch set 5 12/17/11, 15:43

    Sorry, that was to the exact same time... Feel free to repush your version in case mine is not ok.
  14. Markus Klein uploaded patch set 5 12/17/11, 15:43

  15. Julian Hofmann commented on patch set 5 12/17/11, 15:43

    Verified; Looks good to me, but someone else must approve Looks good. Works. Tested with 4.5.9, IE7
  16. Steffen Ritter commented on patch set 2 12/17/11, 15:43

    Verified; Looks good to me, but someone else must approve
  17. Steffen Ritter commented on patch set 2 12/17/11, 15:43

    thanks Stan this would have been the way I would had changed the Patch, too
  18. Steffen Ritter commented on patch set 5 V 0 12/17/11, 15:43

    by team member; Looks good to me, approved
  19. Mr. Jenkins commented on patch set 1 12/17/11, 15:43

  20. Mr. Jenkins commented on patch set 2 12/17/11, 15:43

  21. Mr. Jenkins commented on patch set 3 12/17/11, 15:43

  22. Mr. Jenkins commented on patch set 4 12/17/11, 15:43

  23. Mr. Jenkins commented on patch set 5 12/17/11, 15:43

  24. Stanislas Rolland merged patch set 5 12/17/11, 15:43