Commit 50219efd authored by Aaron Wells's avatar Aaron Wells Committed by Gerrit Code Review
Browse files

Update mahara-flashplayer to be based on flowplayer 3.2.18

Bug 1316375

Change-Id: Id5289bb6392a1e2d1f3d3d9b2dea91fba4298408
parent be08f86a
...@@ -447,11 +447,11 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype { ...@@ -447,11 +447,11 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
} }
define('BLOCKTYPE_INTERNALMEDIA_JS_INCLUDED', true); define('BLOCKTYPE_INTERNALMEDIA_JS_INCLUDED', true);
if ($asarray) { if ($asarray) {
return array(get_config('wwwroot').'artefact/file/blocktype/internalmedia/mahara-flashplayer/mahara-flashplayer-3.2.6.js', return array(get_config('wwwroot').'artefact/file/blocktype/internalmedia/mahara-flashplayer/mahara-flashplayer.js',
get_config('wwwroot') . 'artefact/file/blocktype/internalmedia/swfobject.js', get_config('wwwroot') . 'artefact/file/blocktype/internalmedia/swfobject.js',
); );
} }
return '<script src="'.get_config('wwwroot').'artefact/file/blocktype/internalmedia/mahara-flashplayer/mahara-flashplayer-3.2.6.js"></script> return '<script src="'.get_config('wwwroot').'artefact/file/blocktype/internalmedia/mahara-flashplayer/mahara-flashplayer.js"></script>
<script src="' . get_config('wwwroot') . 'artefact/file/blocktype/internalmedia/swfobject.js" type="text/javascript"></script>'; <script src="' . get_config('wwwroot') . 'artefact/file/blocktype/internalmedia/swfobject.js" type="text/javascript"></script>';
} }
......
...@@ -5,7 +5,7 @@ This is a modified version of FlowPlayer. In accordance with the FlowPlayer ...@@ -5,7 +5,7 @@ This is a modified version of FlowPlayer. In accordance with the FlowPlayer
GPL license, it has been renamed to "mahara-flashplayer" for distribution. GPL license, it has been renamed to "mahara-flashplayer" for distribution.
Website: https://gitorious.org/mahara/mahara-flashplayer Website: https://gitorious.org/mahara/mahara-flashplayer
Version: 3.2.16dev Version: 3.2.18
This flash video player is used by the Mahara internal media blocktype. The This flash video player is used by the Mahara internal media blocktype. The
primary modification made from the original project is that it has been primary modification made from the original project is that it has been
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment