Removed useless code

s9e · Dec 4, 2013 · 477d2ad · 477d2ad
1 parent dee9ae8
commit 477d2ad
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 22 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="20131203b" version_string="201312031" 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="20131204" version_string="201312040" install_callback_class="s9e_MediaBBCodes" install_callback_method="install">
   <bb_code_media_sites>
     <site media_site_id="bandcamp" site_title="Bandcamp" site_url="http://bandcamp.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="matchBandcamp">
       <match_urls>!(?'id')bandcamp\.com/album/.!

diff --git a/build/upload/library/s9e/MediaBBCodes.php b/build/upload/library/s9e/MediaBBCodes.php
@@ -110,16 +110,7 @@ function ($m) use ($scrapeVars)
 
 	public static function embed($mediaKey, $site)
 	{
-		if (preg_match('(^https?://)', $mediaKey))
-		{
-			$regexps = (isset($site['regexes']) && is_array($site['regexes']))
-			         ? $site['regexes']
-			         : array();
-
-			// If the URL is stored in the media site, reparse it and store the captures
-			$vars = self::getNamedCaptures($mediaKey, $regexps);
-		}
-		elseif (preg_match('(^(\\w+=[^;]*)(?>;(?1))*$)', $mediaKey))
+		if (preg_match('(^(\\w+=[^;]*)(?>;(?1))*$)', $mediaKey))
 		{
 			// If the URL looks like a series of key=value pairs, add them to $vars
 			$vars = array();

diff --git a/scripts/build.php b/scripts/build.php
@@ -128,16 +128,7 @@ function ($m) use ($scrapeVars)
 
 	public static function embed($mediaKey, $site)
 	{
-		if (preg_match('(^https?://)', $mediaKey))
-		{
-			$regexps = (isset($site['regexes']) && is_array($site['regexes']))
-			         ? $site['regexes']
-			         : array();
-
-			// If the URL is stored in the media site, reparse it and store the captures
-			$vars = self::getNamedCaptures($mediaKey, $regexps);
-		}
-		elseif (preg_match('(^(\\w+=[^;]*)(?>;(?1))*$)', $mediaKey))
+		if (preg_match('(^(\\w+=[^;]*)(?>;(?1))*$)', $mediaKey))
 		{
 			// If the URL looks like a series of key=value pairs, add them to $vars
 			$vars = array();