From 9574c2ef0d8a8d1fcf25848e9fda8f814231e1d0 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Fri, 30 Dec 2011 12:04:41 +0100 Subject: [PATCH] MDL-30950 remove references to removed admin block Credit goes to Ralf Hilgenstock. --- backup/cc/cc2moodle.php | 2 +- config-dist.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backup/cc/cc2moodle.php b/backup/cc/cc2moodle.php index a13362b4d0d..045de97dfe7 100644 --- a/backup/cc/cc2moodle.php +++ b/backup/cc/cc2moodle.php @@ -379,7 +379,7 @@ class cc2moodle { if (!empty($CFG->defaultblocks)) { $blocknames = $CFG->defaultblocks; } else { - $blocknames = 'participants,activity_modules,search_forums,admin,course_list:news_items,calendar_upcoming,recent_activity'; + $blocknames = 'participants,activity_modules,search_forums,course_list:news_items,calendar_upcoming,recent_activity'; } } diff --git a/config-dist.php b/config-dist.php index 6a5f7fc1b0d..c41b79570cf 100644 --- a/config-dist.php +++ b/config-dist.php @@ -196,17 +196,17 @@ $CFG->admin = 'admin'; // // These variables define DEFAULT block variables for new courses // If this one is set it overrides all others and is the only one used. -// $CFG->defaultblocks_override = 'participants,activity_modules,search_forums,admin,course_list:news_items,calendar_upcoming,recent_activity'; +// $CFG->defaultblocks_override = 'participants,activity_modules,search_forums,course_list:news_items,calendar_upcoming,recent_activity'; // // These variables define the specific settings for defined course formats. // They override any settings defined in the formats own config file. -// $CFG->defaultblocks_site = 'site_main_menu,admin,course_list:course_summary,calendar_month'; -// $CFG->defaultblocks_social = 'participants,search_forums,calendar_month,calendar_upcoming,social_activities,recent_activity,admin,course_list'; -// $CFG->defaultblocks_topics = 'participants,activity_modules,search_forums,admin,course_list:news_items,calendar_upcoming,recent_activity'; -// $CFG->defaultblocks_weeks = 'participants,activity_modules,search_forums,admin,course_list:news_items,calendar_upcoming,recent_activity'; +// $CFG->defaultblocks_site = 'site_main_menu,course_list:course_summary,calendar_month'; +// $CFG->defaultblocks_social = 'participants,search_forums,calendar_month,calendar_upcoming,social_activities,recent_activity,course_list'; +// $CFG->defaultblocks_topics = 'participants,activity_modules,search_forums,course_list:news_items,calendar_upcoming,recent_activity'; +// $CFG->defaultblocks_weeks = 'participants,activity_modules,search_forums,course_list:news_items,calendar_upcoming,recent_activity'; // // These blocks are used when no other default setting is found. -// $CFG->defaultblocks = 'participants,activity_modules,search_forums,admin,course_list:news_items,calendar_upcoming,recent_activity'; +// $CFG->defaultblocks = 'participants,activity_modules,search_forums,course_list:news_items,calendar_upcoming,recent_activity'; // // You can specify a different class to be created for the $PAGE global, and to // compute which blocks appear on each page. However, I cannot think of any good