Merge branch 'master' into next
authorMarcel Werk <burntime@woltlab.com>
Sun, 5 Jan 2020 22:04:34 +0000 (23:04 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sun, 5 Jan 2020 22:04:34 +0000 (23:04 +0100)
1  2 
com.woltlab.wcf/mediaProvider.xml
wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php

index f4e0ad43ad97315244b29a6d98a929bcca3afd67,073ed67ad987840c83a7ad5425d3c65758d29142..4f065ecaaa6a2b2d66e70253efc16b1bbcd382e9
@@@ -47,11 -55,7 +47,6 @@@ https?://vimeo\.com/groups/[^/]+/videos
                        <regex><![CDATA[https?://(?:www\.)?(?:instagram\.com|instagr\.am)/p/(?<ID>[a-zA-Z0-9_-]+)]]></regex>
                        <html><![CDATA[<blockquote class="instagram-media" data-instgrm-version="7"><a href="https://www.instagram.com/p/{$ID}/"></a></blockquote><script async defer src="//platform.instagram.com/en_US/embeds.js"></script>]]></html>
                </provider>
-               <provider name="imgur">
-                       <title>Imgur</title>
-                       <regex><![CDATA[https?://imgur.com/(?:gallery/)?(?P<ID>[a-zA-Z0-9-]+)]]></regex>
-                       <html><![CDATA[<blockquote class="imgur-embed-pub" data-id="a/{$ID}"></blockquote><script async src="//s.imgur.com/min/embed.js" charset="utf-8"></script>]]></html>
-               </provider>
 -              
                <provider name="spotify-playlist">
                        <title>Spotify Playlist</title>
                        <regex><![CDATA[https?://play.spotify.com/user/(?<USER>[0-9a-zA-Z]+)/playlist/(?<ID>[0-9a-zA-Z]+)
@@@ -80,12 -88,10 +75,16 @@@ https?://open.spotify.com/(?<TYPE>[a-zA
  https?://www.twitch.tv/[a-zA-Z0-9]+/v/(?<ID>[0-9]+)]]></regex>
                        <html><![CDATA[<div class="videoContainer"><iframe src="https://player.twitch.tv/?video=v{$ID}&autoplay=false" frameborder="0" scrolling="no" allowfullscreen></iframe></div>]]></html>
                </provider>
 +              <provider name="twitter-tweet">
 +                      <title>Twitter Tweet</title>
 +                      <regex><![CDATA[https://twitter.com/(?<USERNAME>[0-9a-zA-Z_]+)/status/(?<ID>[0-9]+)]]></regex>
 +                      <html><![CDATA[<script>window.twttr=function(t,e,r){var n,i=t.getElementsByTagName(e)[0],w=window.twttr||{};return t.getElementById(r)?w:((n=t.createElement(e)).id=r,n.src="https://platform.twitter.com/widgets.js",i.parentNode.insertBefore(n,i),w._e=[],w.ready=function(t){w._e.push(t)},w)}(document,"script","twitter-wjs");</script>
 +<div data-wsc-twitter-tweet="{$ID}"></div>
 +<script>twttr.ready(function(t){elBySelAll("[data-wsc-twitter-tweet]",void 0,function(t){elData(t,"wsc-twitter-tweet")&&(twttr.widgets.createTweet(elData(t,"wsc-twitter-tweet"),t,{dnt:!0}),elData(t,"wsc-twitter-tweet",""))})});</script>]]></html>
 +              </provider>
        </import>
 -              <provider name="facebook-video" />
+       
+       <delete>
+               <provider name="imgur" />
+       </delete>
  </data>