Review main Merged

28639[BUGFIX] Module Menu throws PHP warning for top level menu items

Benni Mack CR +2 V +2 Easy +13 −9 updated 03/23/14, 10:10

Commit message

When rendering the module menu icons, the menu items
on the top level (Web, File, User, Admin) don't have an icon,
however the getModuleIcon functionality processes them,
and checks for getimagesize() even though no image is added.

To overcome this, the function needs to be modified slightly to
only call getimagesize if there is actually an icon.

Review

  • Code review CR +2
    • Xavier Perseguers +2
    • Stefan Neufeind +1
    • Markus Klein +1
  • Verified V +2
    • Xavier Perseguers +2
    • Markus Klein +1

Issues 1

Files 1

Review log 8

  1. Mr. Jenkins commented on patch set 1 03/22/14, 13:07

  2. Markus Klein commented on patch set 1 03/22/14, 18:34

    ModuleMenuView.php:286

    So if $GLOBALS['LANG']->moduleLabels['tabs_images'][$moduleKey] is not set, we already have a PHP notice in line 285.
  3. Markus Klein uploaded patch set 2 03/22/14, 19:22

  4. Mr. Jenkins commented on patch set 2 03/22/14, 19:36

  5. Markus Klein voted on patch set 2 V +1 CR +1 03/22/14, 20:05

  6. Stefan Neufeind commented on patch set 2 CR +1 03/23/14, 09:47

    Didn't get the warnings here when testing. But patch looks okay.
  7. Xavier Perseguers voted on patch set 2 V +2 CR +2 03/23/14, 10:10

  8. Xavier Perseguers merged patch set 3 03/23/14, 10:10