merged fix for 6884

diff --git a/blocks/rss_client/block_rss_client.php b/blocks/rss_client/block_rss_client.php
index d64a71a541ff30383d4ae38ff3ca23420eb5ea86..4e87d345470e861b9d1d1baa6115b2444c55d96a 100644 (file)
--- a/blocks/rss_client/block_rss_client.php
+++ b/blocks/rss_client/block_rss_client.php
@@ -102,7 +102,8 @@
                                           'sesskey' => $USER->sesskey,
                                           'blockaction' => 'config',
                                           'currentaction' => 'managefeeds',
-                                          'id' => $this->courseid
+                                          'id' => $this->courseid,
+                                          'section' => 'rss'
                                           ));
                 $output .= '<div align="center"><a title="'. get_string('feedsaddedit', 'block_rss_client') .'" href="'. $script .'">'. get_string('feedsaddedit', 'block_rss_client') .'</a></div>';
             } else {
@@ -113,7 +114,8 @@
                                           'sesskey' => $USER->sesskey,
                                           'blockaction' => 'config',
                                           'currentaction' => 'configblock',
-                                          'id' => $this->courseid
+                                          'id' => $this->courseid,
+                                          'section' => 'rss'
                                           ));
                     $output .= '<div align="center"><a title="'. get_string('feedsconfigurenewinstance', 'block_rss_client') .'" href="'. $script.'">'. get_string('feedsconfigurenewinstance', 'block_rss_client') .'</a></div>';
                 }

diff --git a/blocks/rss_client/config_instance_tabs.php b/blocks/rss_client/config_instance_tabs.php
index df21bea9b9a257481a2a48a41bdaffe1e4138822..728bd3156d5fad7751c3c0017f1a6fbeedbbc121 100644 (file)
--- a/blocks/rss_client/config_instance_tabs.php
+++ b/blocks/rss_client/config_instance_tabs.php
@@ -9,12 +9,12 @@ $tabs = $row = array();
 $context = get_context_instance(CONTEXT_BLOCK, $this->instance->id);
 
 if (has_capability('moodle/site:manageblocks', $context)) {
-    $script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'configblock', 'id' => $id));
+    $script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'configblock', 'id' => $id, 'section' => 'rss'));
     $row[] = new tabobject('configblock', $script, 
                 get_string('configblock', 'block_rss_client'));
 }
 
-$script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'managefeeds', 'id' => $id));
+$script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'managefeeds', 'id' => $id, 'section' => 'rss'));
 $row[] = new tabobject('managefeeds', $script, 
             get_string('managefeeds', 'block_rss_client'));