Skip to content

Commit

Permalink
Merge branch 'MDL-58957-master-fix' of https://github.com/lameze/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewnicols committed Jul 13, 2017
2 parents 002ac8e + 54ff9a4 commit e45c3ae
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion search/classes/base_block.php
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public function get_doc_url(\core_search\document $doc) {
preg_match('~^course-view-(.*)$~', $instance->pagetypepattern)) {
return new \moodle_url('/course/view.php', ['id' => $courseid], $anchor);
} else if ($instance->pagetypepattern === 'site-index') {
return new \moodle_url('/', [], $anchor);
return new \moodle_url('/', ['redirect' => 0], $anchor);
} else {
debugging('Unexpected page type for block ' . $blockinstanceid . ': ' .
$instance->pagetypepattern, DEBUG_DEVELOPER);
Expand Down
2 changes: 1 addition & 1 deletion search/tests/base_block_test.php
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public function test_get_doc_url() {

// Get document URL.
$doc2 = $this->get_doc($course->id, $block2id);
$expected = new moodle_url('/', [], 'inst' . $block2id);
$expected = new moodle_url('/', ['redirect' => 0], 'inst' . $block2id);
$this->assertEquals($expected, $area->get_doc_url($doc2));
$this->assertEquals($expected, $area->get_context_url($doc2));

Expand Down
5 changes: 5 additions & 0 deletions theme/boost/scss/moodle/blocks.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
left: initial;
}

.block:target {
padding-top: 0 !important; /* stylelint-disable declaration-no-important */
margin-top: 0 !important;
}

.block_search_forums .searchform {
/* Override plugin's default. */
text-align: left;
Expand Down

0 comments on commit e45c3ae

Please sign in to comment.