Skip to content

Commit

Permalink
MDL-55074 blocks: Remove default blocks from course and site
Browse files Browse the repository at this point in the history
  • Loading branch information
Damyon Wiese committed Oct 21, 2016
1 parent 6afd1c6 commit c13115c
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion course/format/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ public function get_default_blocks() {
}
$blocknames = array(
BLOCK_POS_LEFT => array(),
BLOCK_POS_RIGHT => array('search_forums', 'news_items', 'calendar_upcoming', 'recent_activity')
BLOCK_POS_RIGHT => array()
);
return $blocknames;
}
Expand Down
3 changes: 1 addition & 2 deletions course/format/social/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ public function extend_course_navigation($navigation, navigation_node $node) {
public function get_default_blocks() {
return array(
BLOCK_POS_LEFT => array(),
BLOCK_POS_RIGHT => array('search_forums', 'calendar_upcoming', 'social_activities',
'recent_activity', 'course_list')
BLOCK_POS_RIGHT => array()
);
}

Expand Down
2 changes: 1 addition & 1 deletion course/format/topics/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ function ajax_section_move() {
public function get_default_blocks() {
return array(
BLOCK_POS_LEFT => array(),
BLOCK_POS_RIGHT => array('search_forums', 'news_items', 'calendar_upcoming', 'recent_activity')
BLOCK_POS_RIGHT => array()
);
}

Expand Down
2 changes: 1 addition & 1 deletion course/format/weeks/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ function ajax_section_move() {
public function get_default_blocks() {
return array(
BLOCK_POS_LEFT => array(),
BLOCK_POS_RIGHT => array('search_forums', 'news_items', 'calendar_upcoming', 'recent_activity')
BLOCK_POS_RIGHT => array()
);
}

Expand Down
4 changes: 2 additions & 2 deletions lib/blocklib.php
Original file line number Diff line number Diff line change
Expand Up @@ -2256,8 +2256,8 @@ function blocks_get_default_site_course_blocks() {
return blocks_parse_default_blocks_list($CFG->defaultblocks_site);
} else {
return array(
BLOCK_POS_LEFT => array('site_main_menu'),
BLOCK_POS_RIGHT => array('course_summary', 'calendar_month')
BLOCK_POS_LEFT => array(),
BLOCK_POS_RIGHT => array()
);
}
}
Expand Down

0 comments on commit c13115c

Please sign in to comment.