filter MDL-23810 adding a flag to indicate when we're working in an e…

…mbedded resource to prevent winding up with nested Moodles

mod/glossary/filter.php

@@ -139,10 +139,18 @@ function glossary_filter($courseid, $text) {
                 //hardcoding dictionary format in the URL rather than defaulting to the current glossary format which may not work in a popup.
                 //for example "entry list" means the popup would only contain a link that opens another popup.
                 $link = new moodle_url('/mod/glossary/showentry.php', array('courseid'=>$courseid, 'eid'=>$concept->id, 'displayformat'=>'dictionary'));
-                $href_tag_begin = html_writer::start_tag('a', array(
+                $attributes = array(
                     'href'=>$link,
                     'title'=>$title,
-                    'class'=>'glossary autolink glossaryid'.$concept->glossaryid));
+                    'class'=>'glossary autolink glossaryid'.$concept->glossaryid);
+
+                //this flag is optionally set by resource_pluginfile()
+                //if processing an embedded file use target to prevent getting nested Moodles
+                if (isset($CFG->embeddedsoforcelinktarget) && $CFG->embeddedsoforcelinktarget) {
+                    $attributes['target'] = '_top';
+                }
+
+                $href_tag_begin = html_writer::start_tag('a', $attributes);
             }
             $conceptlist[] = new filterobject($concept->concept, $href_tag_begin, '</a>',
                                               $concept->casesensitive, $concept->fullmatch);

mod/resource/lib.php

@@ -401,6 +401,7 @@ function resource_pluginfile($course, $cm, $context, $filearea, $args, $forcedow
     $mimetype = $file->get_mimetype();
     if ($mimetype = 'text/html' or $mimetype = 'text/plain') {
         $filter = $DB->get_field('resource', 'filterfiles', array('id'=>$cm->instance));
+        $CFG->embeddedsoforcelinktarget = true;
     } else {
         $filter = 0;
     }