Merged block self-test fix from stable

diff --git a/blocks/admin_bookmarks/block_admin_bookmarks.php b/blocks/admin_bookmarks/block_admin_bookmarks.php
index 61aa3da1d0432c1e45e8e92b4fea9a0fefbc85e5..9d709ea3c58d5205116d871ff972ff748322c4f6 100644 (file)
--- a/blocks/admin_bookmarks/block_admin_bookmarks.php
+++ b/blocks/admin_bookmarks/block_admin_bookmarks.php
@@ -15,7 +15,7 @@ class block_admin_bookmarks extends block_base {
         if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
             return array('all' => true);
         } else {
-            return array('all' => false);
+            return array('site' => true);
         }
     }
 

diff --git a/blocks/admin_tree/block_admin_tree.php b/blocks/admin_tree/block_admin_tree.php
index bec7c10968504414c166d820f194788eeb9f5059..2a0126b8d26d64beed2db44793f3dfb22ebacfc4 100644 (file)
--- a/blocks/admin_tree/block_admin_tree.php
+++ b/blocks/admin_tree/block_admin_tree.php
@@ -25,7 +25,7 @@ class block_admin_tree extends block_base {
         if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
             return array('site' => true, 'admin' => true);
         } else {
-            return array('all' => false);
+            return array('site' => true);
         }
     }
 

diff --git a/blocks/mnet_hosts/block_mnet_hosts.php b/blocks/mnet_hosts/block_mnet_hosts.php
index 45cb8d8eae7ca71c2b760da515fd184c7f5d1606..cb628b39a0942a251254bfa5f885602e26ab203f 100644 (file)
--- a/blocks/mnet_hosts/block_mnet_hosts.php
+++ b/blocks/mnet_hosts/block_mnet_hosts.php
@@ -14,7 +14,7 @@ class block_mnet_hosts extends block_list {
         if (has_capability('moodle/site:mnetlogintoremote', get_context_instance(CONTEXT_SYSTEM), NULL, false)) {
             return array('all' => true, 'mod' => false);
         } else {
-            return array('all' => false);
+            return array('site' => true);
         }
     }