Changeset 3958:5e250cd51362 for plugins

Timestamp:

02/20/19 14:35:05 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

No more Flash player (flv, mp3) in Dotclear \o/

Location:

plugins

Files:

• attachments/_public.php (modified) (1 diff)
• pages/default-templates/mustek/page.html (modified) (1 diff)

plugins/attachments/_public.php

@@ -120 +120 @@
 
         if (isset($attr['is_video'])) {
+            // Since 2.15 .flv media are no more considered as video (Flash is obsolete)
             $sign = (boolean) $attr['is_video'] ? '==' : '!=';
-            $if[] = '$attach_f->type_prefix ' . $sign . ' "video"';
+            $test = '$attach_f->type_prefix ' . $sign . ' "video"';
+            if ($sign == '==') {
+                $test .= ' && $attach_f->type != "video/x-flv"';
+            } else {
+                $test .= ' || $attach_f->type == "video/x-flv"';
+            }
+            $if[] = $test;
         }
 

plugins/pages/default-templates/mustek/page.html

@@ -40 +40 @@
                     </tpl:AttachmentIf>
                     <tpl:AttachmentIf is_video="1">
-                         <tpl:AttachmentIf is_flv="0">
-                              {{tpl:include src="_video_player.html"}}
-                         {{tpl:else}}
-                              {{tpl:include src="_flv_player.html"}}
-                         </tpl:AttachmentIf>
+                         {{tpl:include src="_video_player.html"}}
                     </tpl:AttachmentIf>
                     <tpl:AttachmentIf is_audio="0" is_video="0">