Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Don't show the "can't find ffmpeg" message to non-admins. Fixes #1528.

  • Loading branch information...
commit b9e11a6f93077a2b012e0a4314667c5b0cf06291 1 parent cd48b89
@bharat bharat authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 modules/gallery/views/form_uploadify.html.php
View
4 modules/gallery/views/form_uploadify.html.php
@@ -112,7 +112,7 @@ function(data) {
</script>
<div class="requires-flash">
- <? if ($suhosin_session_encrypt || !$movies_allowed): ?>
+ <? if ($suhosin_session_encrypt || (identity::active_user()->admin && !$movies_allowed)): ?>
<div class="g-message-block g-info">
<? if ($suhosin_session_encrypt): ?>
<p class="g-error">
@@ -122,7 +122,7 @@ function(data) {
</p>
<? endif ?>
- <? if (!$movies_allowed): ?>
+ <? if (identity::active_user()->admin && !$movies_allowed): ?>
<p class="g-warning">
<?= t("Can't find <i>ffmpeg</i> on your system. Movie uploading disabled. <a href=\"%help_url\">Help!</a>", array("help_url" => "http://codex.gallery2.org/Gallery3:FAQ#Why_does_it_say_I.27m_missing_ffmpeg.3F")) ?>
</p>
Please sign in to comment.
Something went wrong with that request. Please try again.