Merge branch 'master' of git://github.com/gallery/gallery3

2 files changed, 2 insertions, 2 deletions

diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index 8d21d890..6745f0df 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -19,7 +19,7 @@
       </tr>
       <? foreach ($vars as $var): ?>
       <tr class="setting-row <?= text::alternate("g-odd", "g-even") ?>">
-        <td> <?= $var->module_name ?> </td>
+        <td> <?= html::clean($var->module_name) ?> </td>
         <td> <?= html::clean($var->name) ?> </td>
         <td>
           <a href="<?= url::site("admin/advanced_settings/edit/$var->module_name/" . html::clean($var->name)) ?>"
diff --git a/modules/gallery/views/movieplayer.html.php b/modules/gallery/views/movieplayer.html.php
index 96d6532c..343eafe8 100644
--- a/modules/gallery/views/movieplayer.html.php
+++ b/modules/gallery/views/movieplayer.html.php
@@ -14,7 +14,7 @@
       },
       plugins: {
         pseudostreaming: {
-          url: "<?= url::abs_file("lib/flowplayer.pseudostreaming.swf") ?>"
+          url: "<?= url::abs_file("lib/flowplayer.pseudostreaming-byterange.swf") ?>"
         },
         controls: {
           autoHide: 'always',