From 4582da24648e11ea54f86e1f07245853780ba099 Mon Sep 17 00:00:00 2001
From: Michael Aherne <michael.aherne@strath.ac.uk>
Date: Fri, 7 Oct 2016 09:37:07 +0100
Subject: [PATCH] MDL-56319 blocks: Observe empty default blocks setting

---
 backup/cc/cc2moodle.php | 2 +-
 course/format/lib.php   | 2 +-
 lib/blocklib.php        | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backup/cc/cc2moodle.php b/backup/cc/cc2moodle.php
index 3b323ad58d0..6ecf6fe6c74 100644
--- a/backup/cc/cc2moodle.php
+++ b/backup/cc/cc2moodle.php
@@ -381,7 +381,7 @@ class cc2moodle {
         if (!empty($format['defaultblocks'])) {
             $blocknames = $format['defaultblocks'];
         } else {
-            if (!empty($CFG->defaultblocks)) {
+            if (isset($CFG->defaultblocks)) {
                 $blocknames = $CFG->defaultblocks;
             } else {
                 $blocknames = 'participants,activity_modules,search_forums,course_list:news_items,calendar_upcoming,recent_activity';
diff --git a/course/format/lib.php b/course/format/lib.php
index 302c5d9dd0c..f6674275c63 100644
--- a/course/format/lib.php
+++ b/course/format/lib.php
@@ -477,7 +477,7 @@ abstract class format_base {
      */
     public function get_default_blocks() {
         global $CFG;
-        if (!empty($CFG->defaultblocks)){
+        if (isset($CFG->defaultblocks)) {
             return blocks_parse_default_blocks_list($CFG->defaultblocks);
         }
         $blocknames = array(
diff --git a/lib/blocklib.php b/lib/blocklib.php
index 23d99f5ec8a..2f745512651 100644
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -2221,7 +2221,7 @@ function blocks_parse_default_blocks_list($blocksstr) {
 function blocks_get_default_site_course_blocks() {
     global $CFG;
 
-    if (!empty($CFG->defaultblocks_site)) {
+    if (isset($CFG->defaultblocks_site)) {
         return blocks_parse_default_blocks_list($CFG->defaultblocks_site);
     } else {
         return array(
@@ -2239,13 +2239,13 @@ function blocks_get_default_site_course_blocks() {
 function blocks_add_default_course_blocks($course) {
     global $CFG;
 
-    if (!empty($CFG->defaultblocks_override)) {
+    if (isset($CFG->defaultblocks_override)) {
         $blocknames = blocks_parse_default_blocks_list($CFG->defaultblocks_override);
 
     } else if ($course->id == SITEID) {
         $blocknames = blocks_get_default_site_course_blocks();
 
-    } else if (!empty($CFG->{'defaultblocks_' . $course->format})) {
+    } else if (isset($CFG->{'defaultblocks_' . $course->format})) {
         $blocknames = blocks_parse_default_blocks_list($CFG->{'defaultblocks_' . $course->format});
 
     } else {