| @@ -132,9 +132,10 @@ | ||
| 132 | 132 | 'player_width' => '480', 'player_height' => '270', 'player_aspectratio' => '', |
| 133 | 133 | |
| 134 | 134 | // Playback |
| 135 | 135 | 'player_autostart' => 'no', 'player_fallback' => 'yes', 'player_mute' => 'no', |
| 136 | - 'player_primary' => (($attr['player'] === 'jw-player-v7' || $attr['player'] === 'jw-player-v6') ? 'html5' : 'flash'), | |
| 136 | + //260920.1835 Avoid reading the optional player attribute before shortcode defaults have been applied. | |
| 137 | + 'player_primary' => ((isset($attr['player']) && ($attr['player'] === 'jw-player-v7' || $attr['player'] === 'jw-player-v6')) ? 'html5' : 'flash'), | |
| 137 | 138 | 'player_repeat' => 'no', 'player_startparam' => '', // `startparam` seems to be JW Player v6 only. |
| 138 | 139 | |
| 139 | 140 | // Advanced Option Blocks |
| 140 | 141 | 'player_option_blocks' => ''), $attr); |