From 17390771600beadb1d27a236ea2f6c3fd71cdd92 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sat, 2 Jan 2010 13:23:43 +0000 Subject: [PATCH] MDL-21198 fixed regression in last commit --- .../global_navigation_tree/block_global_navigation_tree.php | 5 ++++- .../block_settings_navigation_tree.php | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/blocks/global_navigation_tree/block_global_navigation_tree.php b/blocks/global_navigation_tree/block_global_navigation_tree.php index b5c54e4d36..fc4cbb6620 100644 --- 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 6b976197d3..34bf3b1346 100644 --- 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); -- 2.39.5