file resources: MDL-14541 Object tag embedding PDF's and nested Flash objects does...

Merged from MOODLE_19_STABLE.

Credit goes to David Boyer for reporting and suggesting the fix for PDF files,
and Jon Witts & Mauno Korpelainen for proving a way to reproduce the Flash
issue and tips to fix it.

diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
index 34f71268a7008dd534cf0263cfb138acf161627b..5816aefa7dfd535aa05694fc930b4c03e5e1ae4c 100644 (file)
--- a/mod/resource/type/file/resource.class.php
+++ b/mod/resource/type/file/resource.class.php
@@ -643,12 +643,14 @@ class resource_file extends resource_base {
                 echo '<param name="loop" value="true" />';
                 echo '<param name="controller" value="true" />';
                 echo '<param name="scale" value="aspect" />';
+                echo '<param name="base" value="." />';
                 echo '<!--[if !IE]>-->';
                 echo "<object type=\"application/x-shockwave-flash\" data=\"$fullurl\">";
                 echo '<param name="controller" value="true" />';
                 echo '<param name="autoplay" value="true" />';
                 echo '<param name="loop" value="true" />';
                 echo '<param name="scale" value="aspect" />';
+                echo '<param name="base" value="." />';
                 echo '<!--<![endif]-->';
                 echo '<a href="' . $fullurl . '">' . $fullurl . '</a>';
                 echo '<!--[if !IE]>-->';
@@ -665,6 +667,7 @@ class resource_file extends resource_base {
             } elseif ($resourcetype == 'pdf') {
                 echo '<div class="resourcepdf">';
                 echo '<object data="' . $fullurl . '" type="application/pdf">';
+                echo '<param name="src" value="' . $fullurl . '" />';
                 echo get_string('clicktoopen', 'resource') . '<a href="' . $fullurl . '">' . format_string($resource->name) . '</a>';
                 echo '</object>';
                 echo '</div>';