Merge branch 'wip-mdl-37015-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE

2012-12-24 10:55:19 +13:00
parent 9a57563b9f a1ccc146ac
commit 3124654247
2 changed files with 4 additions and 3 deletions
@@ -1922,7 +1922,7 @@ class global_navigation extends navigation_node {
                    $propogrationhandler = 'e.halt();';
                }
                // Decode the onclick - it has already been encoded for display (puke)
-                $onclick = htmlspecialchars_decode($activity->onclick);
+                $onclick = htmlspecialchars_decode($activity->onclick, ENT_QUOTES);
                // Build the JS function the click event will call
                $jscode = "function {$functionname}(e) { $propogrationhandler $onclick }";
                $this->page->requires->js_init_code($jscode);