blocklib: MDL-19010 fix some minor problems with existing blocks.

diff --git a/blocks/online_users/block_online_users.php b/blocks/online_users/block_online_users.php
index 229f7b004d1d392cd8798862d433b02d5f216f97..33923ea317ecac02ac11bbc3337db5b97e0ed1aa 100644 (file)
--- a/blocks/online_users/block_online_users.php
+++ b/blocks/online_users/block_online_users.php
@@ -111,7 +111,7 @@ class block_online_users extends block_base {
         $minutes  = floor($timetoshowusers/60);
 
         // Verify if we can see the list of users, if not just print number of users
-        if (!has_capability('block/online_users:viewlist', $blockcontext)) {
+        if (!has_capability('block/online_users:viewlist', $context)) {
             if (!$usercount = $DB->count_records_sql($csql, $params)) {
                 $usercount = get_string("none");
             }

diff --git a/blocks/rss_client/block_rss_client.php b/blocks/rss_client/block_rss_client.php
index 4bec6598d2bf8dbbfc5ce55912ab2740e39a2357..0b3b9f74c581b1426750f87bbd3dc61ee9c42a0f 100644 (file)
--- a/blocks/rss_client/block_rss_client.php
+++ b/blocks/rss_client/block_rss_client.php
@@ -128,7 +128,7 @@
                                           'sesskey' => sesskey(),
                                           'blockaction' => 'config',
                                           'currentaction' => 'configblock',
-                                          'id' => $this->courseid,
+                                          'id' => $this->page->course->id,
                                           'section' => 'rss'
                                           ));
                     $output .= '<div class="info"><a title="'. get_string('feedsconfigurenewinstance', 'block_rss_client') .'" href="'. $script.'">'. get_string('feedsconfigurenewinstance', 'block_rss_client') .'</a></div>';