diff --git a/src/Bundles/MediaPack/Renderer.php b/src/Bundles/MediaPack/Renderer.php
index 7be468e3aa..3668788c7a 100644
--- a/src/Bundles/MediaPack/Renderer.php
+++ b/src/Bundles/MediaPack/Renderer.php
@@ -43,7 +43,7 @@ protected function at(\DOMNode $root)
else
{
$tb = self::$tagBranches[$node->nodeName];
- if($tb<62)if($tb<31){if($tb<16)if($tb<8)if($tb<4)if($tb===0)$this->out.='
';elseif($tb===1){$this->out.='';}elseif($tb===2)$this->out.='';elseif($node->getAttribute('mode')==='album')$this->out.='';else$this->out.='';elseif($tb===4){$this->out.='';}elseif($tb===5){$this->out.='';}elseif($tb===6)$this->out.='';else$this->out.='';elseif($tb<12)if($tb===8)$this->out.='';elseif($tb===9)$this->out.='';elseif($tb===10){$this->out.='';if($node->hasAttribute('pid'))$this->out.='
';$this->out.='
';}else$this->out.='';elseif($tb===12)$this->out.='';elseif($tb===13)$this->out.='';elseif($tb===14)$this->out.='';else$this->out.='';elseif($tb<24)if($tb<20)if($tb===16)$this->out.='';elseif($tb===17)$this->out.='';elseif($tb===18){$this->out.='';}else$this->out.='';elseif($tb===20)$this->out.='';elseif($tb===21)$this->out.='';elseif($tb===22)$this->out.='';else$this->out.='';elseif($tb<28)if($tb===24)$this->out.='';elseif($tb===25)$this->out.='';elseif($tb===26)$this->out.='';else$this->out.='';elseif($tb===28){$this->out.='';}elseif($tb===29){$this->out.='';}else{$this->out.='';}}elseif($tb<47)if($tb<39)if($tb<35)if($tb===31){$this->out.='';}elseif($tb===32)$this->out.='';elseif($tb===33)$this->out.='';else$this->out.='';elseif($tb===35)$this->out.='';elseif($tb===36){$this->out.='';}elseif($tb===37)$this->out.='';else$this->out.='';elseif($tb<43)if($tb===39)$this->out.='';elseif($tb===40)$this->out.='';elseif($tb===41)$this->out.='';else$this->out.='';elseif($tb===43)$this->out.='';elseif($tb===44){$this->out.='';}elseif($tb===45)$this->out.='';else$this->out.='';elseif($tb<55)if($tb<51)if($tb===47){$this->out.='';}elseif($tb===48)$this->out.='';elseif($tb===49)$this->out.='';else$this->out.='';elseif($tb===51)if($node->hasAttribute('video'))$this->out.='';else$this->out.='';elseif($tb===52)$this->out.='';elseif($tb===53)$this->out.='';else$this->out.='';elseif($tb<59)if($tb===55)$this->out.='';elseif($tb===56){$this->out.='';}elseif($tb===57)$this->out.='';else$this->out.='';elseif($tb===59)$this->out.='';elseif($tb===60)$this->out.='';else$this->out.='';elseif($tb<93)if($tb<78)if($tb<70)if($tb<66)if($tb===62)$this->out.='';elseif($tb===63)$this->out.='';elseif($tb===64)$this->out.='';else$this->out.='';elseif($tb===66)$this->out.='';elseif($tb===67)$this->out.='';elseif($tb===68){$this->out.='';}else$this->out.='';elseif($tb<74)if($tb===70)$this->out.='';elseif($tb===71)$this->out.='';elseif($tb===72)$this->out.='';else{$this->out.='';}elseif($tb===74)$this->out.='';elseif($tb===75)$this->out.='';elseif($tb===76)$this->out.='';else$this->out.='';elseif($tb<86)if($tb<82)if($tb===78)$this->out.='';elseif($tb===79)$this->out.='';elseif($tb===80)$this->out.='';else{$this->out.='';}elseif($tb===82)$this->out.='';elseif($tb===83){$this->out.='';}elseif($tb===84)$this->out.='';else$this->out.='';elseif($tb<90){if($tb===86)$this->out.='';elseif($tb===87)$this->out.='';elseif($tb===88)$this->out.='';else{$this->out.='';}}elseif($tb===90)$this->out.='';elseif($tb===91)$this->out.='';else$this->out.='';elseif($tb<109)if($tb<101)if($tb<97)if($tb===93)$this->out.='';elseif($tb===94)$this->out.='';elseif($tb===95)$this->out.='';else$this->out.='';elseif($tb===97){$this->out.='';}elseif($tb===98)$this->out.='';elseif($tb===99){$this->out.='';if($node->hasAttribute('vid'))$this->out.='';$this->out.='
';}else$this->out.='';elseif($tb<105)if($tb===101)$this->out.='';elseif($tb===102)$this->out.='';elseif($tb===103)$this->out.='';else$this->out.='';elseif($tb===105)$this->out.='';elseif($tb===106){$this->out.='';}elseif($tb===107)$this->out.='';else$this->out.='';elseif($tb<117)if($tb<113)if($tb===109)$this->out.='';elseif($tb===110)$this->out.='';elseif($tb===111)$this->out.='';else$this->out.='';elseif($tb===113)$this->out.='';elseif($tb===114)$this->out.='';elseif($tb===115)$this->out.='';else$this->out.='';elseif($tb<121)if($tb===117)$this->out.='';elseif($tb===118)$this->out.='';elseif($tb===119){$this->out.='';}else$this->out.='';elseif($tb===121)$this->out.='
';elseif($tb===122);else{$this->out.='';$this->at($node);$this->out.='
';}
+ if($tb<62)if($tb<31){if($tb<16)if($tb<8)if($tb<4)if($tb===0)$this->out.='';elseif($tb===1){$this->out.='';}elseif($tb===2)$this->out.='';elseif($node->getAttribute('mode')==='album')$this->out.='';else$this->out.='';elseif($tb===4){$this->out.='';}elseif($tb===5){$this->out.='';}elseif($tb===6)$this->out.='';else$this->out.='';elseif($tb<12)if($tb===8)$this->out.='';elseif($tb===9)$this->out.='';elseif($tb===10){$this->out.='';if($node->hasAttribute('pid'))$this->out.='
';$this->out.='
';}else$this->out.='';elseif($tb===12)$this->out.='';elseif($tb===13)$this->out.='';elseif($tb===14)$this->out.='';else$this->out.='';elseif($tb<24)if($tb<20)if($tb===16)$this->out.='';elseif($tb===17)$this->out.='';elseif($tb===18){$this->out.='';}else$this->out.='';elseif($tb===20)$this->out.='';elseif($tb===21)$this->out.='';elseif($tb===22)$this->out.='';else$this->out.='';elseif($tb<28)if($tb===24)$this->out.='';elseif($tb===25)$this->out.='';elseif($tb===26)$this->out.='';else$this->out.='';elseif($tb===28){$this->out.='';}elseif($tb===29){$this->out.='';}else{$this->out.='';}}elseif($tb<47)if($tb<39)if($tb<35)if($tb===31){$this->out.='';}elseif($tb===32)$this->out.='';elseif($tb===33)$this->out.='';else$this->out.='';elseif($tb===35)$this->out.='';elseif($tb===36){$this->out.='';}elseif($tb===37)$this->out.='';else$this->out.='';elseif($tb<43)if($tb===39)$this->out.='';elseif($tb===40)$this->out.='';elseif($tb===41)$this->out.='';else$this->out.='';elseif($tb===43)$this->out.='';elseif($tb===44){$this->out.='';}elseif($tb===45)$this->out.='';else$this->out.='';elseif($tb<55)if($tb<51)if($tb===47){$this->out.='';}elseif($tb===48)$this->out.='';elseif($tb===49)$this->out.='';else$this->out.='';elseif($tb===51)if($node->hasAttribute('video'))$this->out.='';else$this->out.='';elseif($tb===52)$this->out.='';elseif($tb===53)$this->out.='';else$this->out.='';elseif($tb<59)if($tb===55)$this->out.='';elseif($tb===56){$this->out.='';}elseif($tb===57)$this->out.='';else$this->out.='';elseif($tb===59)$this->out.='';elseif($tb===60)$this->out.='';else$this->out.='';elseif($tb<93)if($tb<78)if($tb<70)if($tb<66)if($tb===62)$this->out.='';elseif($tb===63)$this->out.='';elseif($tb===64)$this->out.='';else$this->out.='';elseif($tb===66)$this->out.='';elseif($tb===67)$this->out.='';elseif($tb===68){$this->out.='';}else$this->out.='';elseif($tb<74)if($tb===70)$this->out.='';elseif($tb===71)$this->out.='';elseif($tb===72)$this->out.='';else{$this->out.='';}elseif($tb===74)$this->out.='';elseif($tb===75)$this->out.='';elseif($tb===76)$this->out.='';else$this->out.='';elseif($tb<86)if($tb<82)if($tb===78)$this->out.='';elseif($tb===79)$this->out.='';elseif($tb===80)$this->out.='';else{$this->out.='';}elseif($tb===82)$this->out.='';elseif($tb===83){$this->out.='';}elseif($tb===84)$this->out.='';else$this->out.='';elseif($tb<90){if($tb===86)$this->out.='';elseif($tb===87)$this->out.='';elseif($tb===88)$this->out.='';else{$this->out.='';}}elseif($tb===90)$this->out.='';elseif($tb===91)$this->out.='';else$this->out.='';elseif($tb<109)if($tb<101)if($tb<97)if($tb===93)$this->out.='';elseif($tb===94)$this->out.='';elseif($tb===95)$this->out.='';else$this->out.='';elseif($tb===97){$this->out.='';}elseif($tb===98)$this->out.='';elseif($tb===99){$this->out.='';if($node->hasAttribute('vid'))$this->out.='';$this->out.='
';}else$this->out.='';elseif($tb<105)if($tb===101)$this->out.='';elseif($tb===102)$this->out.='';elseif($tb===103)$this->out.='';else$this->out.='';elseif($tb===105)$this->out.='';elseif($tb===106){$this->out.='';}elseif($tb===107)$this->out.='';else$this->out.='';elseif($tb<117)if($tb<113)if($tb===109)$this->out.='';elseif($tb===110)$this->out.='';elseif($tb===111)$this->out.='';else$this->out.='';elseif($tb===113)$this->out.='';elseif($tb===114)$this->out.='';elseif($tb===115)$this->out.='';else$this->out.='';elseif($tb<121)if($tb===117)$this->out.='';elseif($tb===118)$this->out.='';elseif($tb===119){$this->out.='';}else$this->out.='';elseif($tb===121)$this->out.='
';elseif($tb===122);else{$this->out.='';$this->at($node);$this->out.='
';}
}
}
private static $dynamic=['ABCNEWS'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'AUDIOBOOM'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'BLAB'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'BLEACHERREPORT'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'BREAK'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'BRIGHTCOVE'=>['(^[^ ]+(?> (?!bc(?>key|pid|tid)=)[^=]+="[^"]*")*(?> bckey="([^"]*)")?(?> (?!bc[pt]id=)[^=]+="[^"]*")*(?> bcpid="([^"]*)")?(?> (?!bctid=)[^=]+="[^"]*")*(?> bctid="([^"]*)")?.*)s',''],'CNBC'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'CNN'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'CNNMONEY'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'COLLEGEHUMOR'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'COMEDYCENTRAL'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'COUB'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'DAILYMOTION'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'EIGHTTRACKS'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'ESPN'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'FLICKR'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'FORATV'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'FOXNEWS'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'FUNNYORDIE'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'GAMESPOT'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'GIST'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'GLOBALNEWS'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'GOFUNDME'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'GOOGLEDRIVE'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'GOOGLESHEETS'=>['(^[^ ]+(?> (?!g?id=)[^=]+="[^"]*")*(?> gid="([^"]*)")?(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'HEALTHGURU'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'HUDL'=>['(^[^ ]+(?> (?!(?>athlete|highlight)=)[^=]+="[^"]*")*(?> athlete="([^"]*)")?(?> (?!highlight=)[^=]+="[^"]*")*(?> highlight="([^"]*)")?.*)s',''],'HULU'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'HUMORTVNL'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'IGN'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'IMDB'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'INDIEGOGO'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'INSTAGRAM'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'IZLESENE'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'JWPLATFORM'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'KHL'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'KISSVIDEO'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'LIBSYN'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'LIVECAP'=>['(^[^ ]+(?> (?!(?>channel|id)=)[^=]+="[^"]*")*(?> channel="([^"]*)")?(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'LIVELEAK'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'MAILRU'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'METACAFE'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'MIXCLOUD'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'MLB'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'MRCTV'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'MSNBC'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'NATGEOCHANNEL'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'NATGEOVIDEO'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'NBCNEWS'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'NBCSPORTS'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'NPR'=>['(^[^ ]+(?> (?![im]=)[^=]+="[^"]*")*(?> i="([^"]*)")?(?> (?!m=)[^=]+="[^"]*")*(?> m="([^"]*)")?.*)s',''],'NYTIMES'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'ODDSHOT'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'PASTEBIN'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'PLAYSTV'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'PODBEAN'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'PREZI'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'REDDIT'=>['(^[^ ]+(?> (?!path=)[^=]+="[^"]*")*(?> path="([^"]*)")?.*)s',''],'RUTUBE'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'SCRIBD'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'SLIDESHARE'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'SPORTSNET'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'STEAMSTORE'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'STITCHER'=>['(^[^ ]+(?> (?![ef]id=)[^=]+="[^"]*")*(?> eid="([^"]*)")?(?> (?!fid=)[^=]+="[^"]*")*(?> fid="([^"]*)")?.*)s',''],'STRAWPOLL'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'STREAMABLE'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'TEAMCOCO'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'THEATLANTIC'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'THEGUARDIAN'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'THEONION'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'TINYPIC'=>['(^[^ ]+(?> (?!(?>s|id)=)[^=]+="[^"]*")*(?> id="([^"]*)")?(?> (?!s=)[^=]+="[^"]*")*(?> s="([^"]*)")?.*)s',''],'TMZ'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'TRAILERADDICT'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'TUMBLR'=>['(^[^ ]+(?> (?!(?>id|key)=)[^=]+="[^"]*")*(?> id="([^"]*)")?(?> (?!key=)[^=]+="[^"]*")*(?> key="([^"]*)")?.*)s',''],'TWITTER'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'VBOX7'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'VEOH'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'VEVO'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'VIAGAME'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'VIDEODETECTIVE'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'VIDEOMEGA'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'VIMEO'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'VINE'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'VK'=>['(^[^ ]+(?> (?!(?>hash|oid|vid)=)[^=]+="[^"]*")*(?> hash="([^"]*)")?(?> (?![ov]id=)[^=]+="[^"]*")*(?> oid="([^"]*)")?(?> (?!vid=)[^=]+="[^"]*")*(?> vid="([^"]*)")?.*)s',''],'VOCAROO'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'VOX'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'WASHINGTONPOST'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'WSHH'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'WSJ'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'XBOXCLIPS'=>['(^[^ ]+(?> (?!(?>id|user)=)[^=]+="[^"]*")*(?> id="([^"]*)")?(?> (?!user=)[^=]+="[^"]*")*(?> user="([^"]*)")?.*)s',''],'XBOXDVR'=>['(^[^ ]+(?> (?!(?>id|user)=)[^=]+="[^"]*")*(?> id="([^"]*)")?(?> (?!user=)[^=]+="[^"]*")*(?> user="([^"]*)")?.*)s',''],'YAHOOSCREEN'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'YOUKU'=>['(^[^ ]+(?> (?!id=)[^=]+="[^"]*")*(?> id="([^"]*)")?.*)s',''],'ZIPPYSHARE'=>['(^[^ ]+(?> (?!(?>file|server)=)[^=]+="[^"]*")*(?> file="([^"]*)")?(?> (?!server=)[^=]+="[^"]*")*(?> server="([^"]*)")?.*)s','']];
@@ -123,7 +123,7 @@ protected function quick($m)
}
$qb = self::$quickBranches[$id];
- if($qb<14){if($qb<7)if($qb<4)if($qb===0){$attributes+=['tld'=>null,'id'=>null];$html='';}elseif($qb===1){$attributes+=['mode'=>null,'id'=>null];$html='';if($attributes['mode']==='album')$html.='';else$html.='';}elseif($qb===2){$attributes+=['track_num'=>null,'track_id'=>null];$html='';}else{$attributes+=['playlist'=>null,'id'=>null];$html='';}elseif($qb===4){$attributes+=['id'=>null];$html='';if(isset($attributes['pid']))$html.='
';$html.='
';}elseif($qb===5){$attributes+=['id'=>null];$html='';}else{$attributes+=['id'=>null];$html='';}elseif($qb<11){if($qb===7){$attributes+=['type'=>null,'id'=>null];$html='';}elseif($qb===8){$attributes+=['id'=>null];$html='';}elseif($qb===9){$attributes+=['width'=>null,'height'=>null,'id'=>null,'et'=>null,'sig'=>null];$html='';}else{$attributes+=['width'=>null,'height'=>null,'id'=>null];$html='';}}elseif($qb===11){$attributes+=['width'=>null,'height'=>null,'id'=>null];$html='';}elseif($qb===12){$attributes+=['name'=>null,'pid'=>null];$html='';}else{$attributes+=['type'=>null,'id'=>null];$html='';}}elseif($qb<21)if($qb<18)if($qb===14){$attributes+=['width'=>null,'height'=>null,'id'=>null];$html='';}elseif($qb===15){$attributes+=['id'=>null];$html='';if(isset($attributes['video']))$html.='';else$html.='';}elseif($qb===16){$attributes+=['channel'=>null,'account_id'=>null,'event_id'=>null];$html='';}else{$attributes+=['id'=>null];$html='';}elseif($qb===18){$attributes+=['t'=>null,'id'=>null];$html='';}elseif($qb===19){$attributes+=['id'=>null];$html='';}else{$attributes+=['secret_token'=>null,'id'=>null];$html='';}elseif($qb<24){if($qb===21){$attributes+=['path'=>null];$html='';}elseif($qb===22){$attributes+=['id'=>null];$html='';}else{$attributes+=['channel'=>null,'clip_id'=>null];$html='';}}elseif($qb===24){$attributes+=['cid'=>null];$html='';if(isset($attributes['vid']))$html.='';$html.='
';}elseif($qb===25){$attributes+=['width'=>null,'height'=>null,'id'=>null];$html='';}else{$attributes+=['id'=>null,'m'=>null,'s'=>null];$html='';}
+ if($qb<14){if($qb<7)if($qb<4)if($qb===0){$attributes+=['tld'=>null,'id'=>null];$html='';}elseif($qb===1){$attributes+=['mode'=>null,'id'=>null];$html='';if($attributes['mode']==='album')$html.='';else$html.='';}elseif($qb===2){$attributes+=['track_num'=>null,'track_id'=>null];$html='';}else{$attributes+=['playlist'=>null,'id'=>null];$html='';}elseif($qb===4){$attributes+=['id'=>null];$html='';if(isset($attributes['pid']))$html.='
';$html.='
';}elseif($qb===5){$attributes+=['id'=>null];$html='';}else{$attributes+=['id'=>null];$html='';}elseif($qb<11){if($qb===7){$attributes+=['type'=>null,'id'=>null];$html='';}elseif($qb===8){$attributes+=['id'=>null];$html='';}elseif($qb===9){$attributes+=['width'=>null,'height'=>null,'id'=>null,'et'=>null,'sig'=>null];$html='';}else{$attributes+=['width'=>null,'height'=>null,'id'=>null];$html='';}}elseif($qb===11){$attributes+=['width'=>null,'height'=>null,'id'=>null];$html='';}elseif($qb===12){$attributes+=['name'=>null,'pid'=>null];$html='';}else{$attributes+=['type'=>null,'id'=>null];$html='';}}elseif($qb<21)if($qb<18)if($qb===14){$attributes+=['width'=>null,'height'=>null,'id'=>null];$html='';}elseif($qb===15){$attributes+=['id'=>null];$html='';if(isset($attributes['video']))$html.='';else$html.='';}elseif($qb===16){$attributes+=['channel'=>null,'account_id'=>null,'event_id'=>null];$html='';}else{$attributes+=['id'=>null];$html='';}elseif($qb===18){$attributes+=['t'=>null,'id'=>null];$html='';}elseif($qb===19){$attributes+=['id'=>null];$html='';}else{$attributes+=['secret_token'=>null,'id'=>null];$html='';}elseif($qb<24){if($qb===21){$attributes+=['path'=>null];$html='';}elseif($qb===22){$attributes+=['id'=>null];$html='';}else{$attributes+=['channel'=>null,'clip_id'=>null];$html='';}}elseif($qb===24){$attributes+=['cid'=>null];$html='';if(isset($attributes['vid']))$html.='';$html.='
';}elseif($qb===25){$attributes+=['width'=>null,'height'=>null,'id'=>null];$html='';}else{$attributes+=['id'=>null,'m'=>null,'s'=>null];$html='';}
return $html;
}
diff --git a/src/Plugins/MediaEmbed/Configurator/TemplateGenerator.php b/src/Plugins/MediaEmbed/Configurator/TemplateGenerator.php
index 90b335320d..067f8e5cdb 100644
--- a/src/Plugins/MediaEmbed/Configurator/TemplateGenerator.php
+++ b/src/Plugins/MediaEmbed/Configurator/TemplateGenerator.php
@@ -60,8 +60,9 @@ public function getTemplate(array $attributes)
}
else
{
- $this->attributes['style']['width'] = '100%';
- $this->attributes['style']['height'] = $this->attributes['height'] . 'px';
+ $this->attributes['style']['width'] = '100%';
+ $this->attributes['style']['height'] = $this->attributes['height'] . 'px';
+ $this->attributes['style']['max-width'] = '100%';
if (isset($this->attributes['max-width']))
{
@@ -72,6 +73,11 @@ public function getTemplate(array $attributes)
$property = ($this->hasDynamicWidth()) ? 'width' : 'max-width';
$this->attributes['style'][$property] = $this->attributes['width'] . 'px';
}
+
+ if ($this->attributes['style']['width'] === $this->attributes['style']['max-width'])
+ {
+ unset($this->attributes['style']['max-width']);
+ }
}
return $prepend . $this->getContentTemplate() . $append;
diff --git a/tests/Plugins/MediaEmbed/Configurator/TemplateGenerators/IframeTest.php b/tests/Plugins/MediaEmbed/Configurator/TemplateGenerators/IframeTest.php
index 732890508e..8583af80cf 100644
--- a/tests/Plugins/MediaEmbed/Configurator/TemplateGenerators/IframeTest.php
+++ b/tests/Plugins/MediaEmbed/Configurator/TemplateGenerators/IframeTest.php
@@ -77,7 +77,7 @@ public function getGetTemplateTests()
'src' => 'foo',
'onload' => 'this.style.height=$height;this.style.width=$width'
],
- ''
+ ''
],
[
[
diff --git a/tests/Plugins/MediaEmbed/ParserTest.php b/tests/Plugins/MediaEmbed/ParserTest.php
index d702cf0847..2d36bafb0b 100644
--- a/tests/Plugins/MediaEmbed/ParserTest.php
+++ b/tests/Plugins/MediaEmbed/ParserTest.php
@@ -1414,7 +1414,7 @@ function ($configurator)
],
[
'https://imgur.com/a/9UGCL',
- '',
+ '',
[],
function ($configurator)
{
@@ -3834,7 +3834,7 @@ function ($configurator)
],
[
'https://imgur.com/AsQ0K3P',
- '',
+ '',
[],
function ($configurator)
{
@@ -3843,7 +3843,7 @@ function ($configurator)
],
[
'http://i.imgur.com/u7Yo0Vy.gifv',
- '',
+ '',
[],
function ($configurator)
{
@@ -3852,7 +3852,7 @@ function ($configurator)
],
[
'http://i.imgur.com/u7Yo0Vy.mp4',
- '',
+ '',
[],
function ($configurator)
{