MDL-21198 fixed regression in last commit

diff --git a/blocks/global_navigation_tree/block_global_navigation_tree.php b/blocks/global_navigation_tree/block_global_navigation_tree.php
index b5c54e4d36b94e774ba97dd2bbc793ef6212f87a..fc4cbb662004db38bb644a0f631d56920d90e640 100644 (file)
--- a/blocks/global_navigation_tree/block_global_navigation_tree.php
+++ b/blocks/global_navigation_tree/block_global_navigation_tree.php
@@ -159,7 +159,10 @@ class block_global_navigation_tree extends block_tree {
         // Grab the items to display
         $this->content->items = array($this->page->navigation);
 
-        $this->content->footer .= $OUTPUT->action_icon($this->page->url, get_string('reload'), array('class'=>'customcommand'), 't/reload');
+        $reloadlink = new html_link(new moodle_url($this->page->url, array('regenerate'=>'navigation')));
+        $reloadlink->add_class('customcommand');
+
+        $this->content->footer .= $OUTPUT->action_icon($reloadlink, get_string('reload'), 't/reload');
 
         if (empty($this->config->enablesidebarpopout) || $this->config->enablesidebarpopout == 'yes') {
             user_preference_allow_ajax_update('nav_in_tab_panel_globalnav'.block_global_navigation_tree::$navcount, PARAM_INT);

diff --git a/blocks/settings_navigation_tree/block_settings_navigation_tree.php b/blocks/settings_navigation_tree/block_settings_navigation_tree.php
index 6b976197d31c23d525342d412a328c7e1dbc2fb2..34bf3b13461ebdfbaa957256ddc4ccead7c36b10 100644 (file)
--- a/blocks/settings_navigation_tree/block_settings_navigation_tree.php
+++ b/blocks/settings_navigation_tree/block_settings_navigation_tree.php
@@ -140,9 +140,9 @@ class block_settings_navigation_tree extends block_tree {
                 $this->content->footer = '';
             }
 
-            $reloadicon = $OUTPUT->action_icon($this->page->url, get_string('reload'), 't/reload', array('class'=>'customcommand'));
-
-            $this->content->footer .= $reloadicon;
+            $reloadlink = new html_link(new moodle_url($this->page->url, array('regenerate'=>'navigation')));
+            $reloadlink->add_class('customcommand');
+            $this->content->footer .= $OUTPUT->action_icon($reloadlink, get_string('reload'), 't/reload');
 
             if (!empty($this->config->enablesidebarpopout) && $this->config->enablesidebarpopout == 'yes') {
                 user_preference_allow_ajax_update('nav_in_tab_panel_settingsnav'.block_settings_navigation_tree::$navcount, PARAM_INT);