Merge branch 'MDL-48430_master' of https://github.com/crazyserver/moodle

2014-12-10 13:24:38 +01:00
parent e600e6ae50 8e371539f4
commit f6c65c2575
1 changed files with 5 additions and 1 deletions
@@ -2861,7 +2861,11 @@ class custom_menu extends custom_menu_item {
                            $itemtitle = $itemtext;
                            break;
                        case 1:
-                            $itemurl = new moodle_url($setting);
+                            try {
+                                $itemurl = new moodle_url($setting);
+                            } catch (Exception $e) {
+                                $itemurl = null;
+                            }
                            break;
                        case 2:
                            $itemtitle = $setting;