diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-12-15 15:15:48 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-12-15 15:16:00 -0800 |
| commit | b9e11a6f93077a2b012e0a4314667c5b0cf06291 (patch) | |
| tree | 9605ee5d920fc07dbfa0aef408a3e8eb16393422 /modules/gallery | |
| parent | cd48b89f3166e7fa732b5cb06d33fba018af9127 (diff) | |
Don't show the "can't find ffmpeg" message to non-admins. Fixes #1528.
Diffstat (limited to 'modules/gallery')
| -rw-r--r-- | modules/gallery/views/form_uploadify.html.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php index 893bb3b9..77b6d493 100644 --- a/modules/gallery/views/form_uploadify.html.php +++ b/modules/gallery/views/form_uploadify.html.php @@ -112,7 +112,7 @@ </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 @@ </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> |