wip #6740 @0.5

diff --git a/src/Links/AudioLink.php b/src/Links/AudioLink.php
index f2d0d594dfc51ac54585d58505ffd86b4398d5d3..fba12ced4c0b4f129e3fd2bbbb833181f9b31f03 100644 (file)
--- a/src/Links/AudioLink.php
+++ b/src/Links/AudioLink.php
@@ -35,9 +35,9 @@ class AudioLink extends Link
      * @param Compiler $compiler
      * @return string
      */
-    public static function makeAudioTag($linkDatas, $w = null, $h = null, $compiler = null)
+    public static function makeAudioTag($linkDatas, $w = null, $h = null, $compiler = null, $theme = null)
     {
-        $theme = $compiler->getSetting('audioPlayerTheme');
+        $theme = $theme === null || $theme === 'inline' ? $compiler->getSetting('audioPlayerTheme') : $theme;
         $controls = '';
         if ($theme === 'native') {
             $controls = 'controls ';

diff --git a/src/Links/AudioPopupLink.php b/src/Links/AudioPopupLink.php
index c425ab0fa0f9a5b7af17a2ded87e67c4aa99991b..1f4c218bd2378f06820a472b2ef3a924a0904d08 100644 (file)
--- a/src/Links/AudioPopupLink.php
+++ b/src/Links/AudioPopupLink.php
@@ -18,7 +18,7 @@ class AudioPopupLink extends NormalLink
 
     public function getAdditionnalContent()
     {
-        return ' data-audio="' . rawurlencode(AudioLink::makeAudioTag($this, null, null, $this->compiler)) . '" ';
+        return ' data-audio="' . rawurlencode(AudioLink::makeAudioTag($this, null, null, $this->compiler, $this->compiler->getSetting('audioPlayerThemePopup', 'native'))) . '" ';
     }
 
     public function keep()