Updated s9e\TextFormatter

s9e · Oct 2, 2016 · 543c50f · 543c50f
1 parent 13122a1
commit 543c50f
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 26 deletions.
diff --git a/bundle.php b/bundle.php
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
 	"type": "phpbb-extension",
 	"description": "Embed third-party content in your phpBB forum",
 	"homepage": "https://github.com/s9e/phpbb-ext-mediaembed/",
-	"version": "20160908",
+	"version": "20161002",
 	"keywords": ["phpbb","embed","forum","media"],
 	"license": "MIT",
 	"require": {

diff --git a/listener.php b/listener.php
@@ -8,6 +8,7 @@
 namespace s9e\mediaembed;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use s9e\TextFormatter\Configurator\Bundles\MediaPack as MediaPackConfigurator;
 use s9e\TextFormatter\Bundles\MediaPack;
 
 class listener implements EventSubscriberInterface
@@ -27,11 +28,8 @@ public static function getSubscribedEvents()
 
 	public function onConfigure($event)
 	{
-		$configurator = $event['configurator'];
-		foreach ($configurator->MediaEmbed->defaultSites->getIds() as $siteId)
-		{
-			$configurator->MediaEmbed->add($siteId);
-		}
+		$bundleConfigurator = new MediaPackConfigurator;
+		$bundleConfigurator->configure($event['configurator']);
 	}
 
 	public function onDisplay($event)

diff --git a/parsing.php b/parsing.php
@@ -1607,8 +1607,7 @@ protected static function addSiteTag(Tag $tag, TagStack $tagStack, $siteId)
 		$endTag = $tag->getEndTag() ?: $tag;
 		$lpos = $tag->getPos();
 		$rpos = $endTag->getPos() + $endTag->getLen();
-		$newTag = $tagStack->addSelfClosingTag(\strtoupper($siteId), $lpos, $rpos - $lpos, $tag->getSortPriority());
-		$newTag->setAttributes($tag->getAttributes());
+		$tagStack->addTagPair(\strtoupper($siteId), $lpos, 0, $rpos, 0, $tag->getSortPriority())->setAttributes($tag->getAttributes());
 	}
 	protected static function addTagFromMediaId(Tag $tag, TagStack $tagStack, array $sites)
 	{

diff --git a/rendering.php b/rendering.php
diff --git a/vendor/s9e/TextFormatter b/vendor/s9e/TextFormatter
diff --git a/versions.json b/versions.json
@@ -1 +1 @@
-{"stable":{"20160908":{"current":"20160908","announcement":"https:\/\/www.phpbb.com\/community\/viewtopic.php?f=456&t=2272431","download":"https:\/\/github.com\/s9e\/phpbb-ext-mediaembed\/releases\/download\/20160908\/s9e-mediaembed-20160908.zip","eol":null,"security":false}}}
+{"stable":{"20161002":{"current":"20161002","announcement":"https:\/\/www.phpbb.com\/community\/viewtopic.php?f=456&t=2272431","download":"https:\/\/github.com\/s9e\/phpbb-ext-mediaembed\/releases\/download\/20161002\/s9e-mediaembed-20161002.zip","eol":null,"security":false}}}