Merge branch 'MDL-58947-m32' of https://github.com/sammarshallou/moodle into MOODLE_32_STABLE

2017-05-17 09:16:55 +08:00
parent 3586517ff8 bb78b2fd22
commit e2f921ea2a
1 changed files with 6 additions and 1 deletions
@@ -45,9 +45,14 @@ class activity extends \core_search\base_activity {
     * @return \moodle_url
     */
    public function get_doc_url(\core_search\document $doc) {
+        // Get correct URL to section that contains label, from course format.
        $cminfo = $this->get_cm($this->get_module_name(), strval($doc->get('itemid')), $doc->get('courseid'));
-        return new \moodle_url('/course/view.php', array('id' => $doc->get('courseid')), 'module-' . $cminfo->id);
+        $format = course_get_format($cminfo->get_course());
+        $url = $format->get_view_url($cminfo->sectionnum);

+        // Add the ID of the label to the section URL.
+        $url->set_anchor('module-' . $cminfo->id);
+        return $url;
    }

    /**