Added support for Unicode and less-than-valid URLs used by some Getty…

… sites
s9e · May 27, 2014 · 614851c · 614851c
1 parent 2c48879
commit 614851c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/build/addon.xml b/build/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<addon addon_id="s9e" title="s9e Media Pack" url="https://github.com/s9e/XenForoMediaBBCodes" version_id="20140525" version_string="201405250" install_callback_class="s9e_MediaBBCodes" install_callback_method="install">
+<addon addon_id="s9e" title="s9e Media Pack" url="https://github.com/s9e/XenForoMediaBBCodes" version_id="20140527" version_string="201405270" install_callback_class="s9e_MediaBBCodes" install_callback_method="install">
   <bb_code_media_sites>
     <site media_site_id="abcnews" site_title="ABC News" site_url="http://abcnews.go.com/" match_is_regex="1" supported="1">
       <match_urls>!abcnews\.go\.com/[^/]+/video/[^/]+-(?'id'\d+)!</match_urls>
@@ -88,7 +88,7 @@
     </site>
     <site media_site_id="getty" site_title="Getty Images" site_url="http://www.gettyimages.com/" match_is_regex="1" supported="1" embed_html_callback_class="s9e_MediaBBCodes" embed_html_callback_method="embed" match_callback_class="s9e_MediaBBCodes" match_callback_method="matchGetty">
       <match_urls>!gty\.im/(?'id'\d+)!
-!(?=.*?g(?:ettyimages\.(?:c(?:n|o(?:\.(?&gt;jp|uk)|m(?&gt;\.au)?))|d[ek]|es|fr|i[et]|nl|pt|[bs]e)|ty\.im)).*?gettyimages\.[.\w]+/detail/(?:[-\w/]+/)?(?'id'\d+)!</match_urls>
+!(?=.*?g(?:ettyimages\.(?:c(?:n|o(?:\.(?&gt;jp|uk)|m(?&gt;\.au)?))|d[ek]|es|fr|i[et]|nl|pt|[bs]e)|ty\.im)).*?gettyimages\.[.\w]+/detail(?=/).*?/(?'id'\d+)!</match_urls>
       <embed_html><![CDATA[<!-- s9e_MediaBBCodes::renderGetty() -->]]></embed_html>
     </site>
     <site media_site_id="gfycat" site_title="gfycat" site_url="http://gfycat.com/" match_is_regex="1" supported="1" embed_html_callback_class="s9e_MediaBBCodes" embed_html_callback_method="embed" match_callback_class="s9e_MediaBBCodes" match_callback_method="matchGfycat">

diff --git a/build/upload/library/s9e/MediaBBCodes.php b/build/upload/library/s9e/MediaBBCodes.php
@@ -455,7 +455,7 @@ public static function renderGetty($vars, $params)
 
 	public static function matchGetty($url)
 	{
-		$regexps = array('!gty\\.im/(?\'id\'\\d+)!', '!(?=.*?g(?:ettyimages\\.(?:c(?:n|o(?:\\.(?>jp|uk)|m(?>\\.au)?))|d[ek]|es|fr|i[et]|nl|pt|[bs]e)|ty\\.im)).*?gettyimages\\.[.\\w]+/detail/(?:[-\\w/]+/)?(?\'id\'\\d+)!');
+		$regexps = array('!gty\\.im/(?\'id\'\\d+)!', '!(?=.*?g(?:ettyimages\\.(?:c(?:n|o(?:\\.(?>jp|uk)|m(?>\\.au)?))|d[ek]|es|fr|i[et]|nl|pt|[bs]e)|ty\\.im)).*?gettyimages\\.[.\\w]+/detail(?=/).*?/(?\'id\'\\d+)!');
 		$scrapes = array(
 			array(
 				'url'     => 'http://embed.gettyimages.com/preview/{@id}',

diff --git a/vendor/s9e/TextFormatter b/vendor/s9e/TextFormatter