Merge pull request #23 from Elsensee/fixnestingimgtag

Fix nesting IMG tags within URL tags

Author: Crizz0

event/listener.php

@@ -40,7 +40,6 @@ class listener implements EventSubscriberInterface
 	 * Constructor
 	 *
 	 * @param config		$config
-	 * @param Container 	$container
 	 * @param helper		$helper
 	 * @param template		$template
 	 * @param user			$user
@@ -59,8 +58,6 @@ public function __construct(config $config, helper $helper, template $template,
 	 * Assign functions defined in this class to event listeners in the core
 	 *
 	 * @return array
-	 * @static
-	 * @access public
 	 */
 	static public function getSubscribedEvents()
 	{
@@ -78,7 +75,6 @@ static public function getSubscribedEvents()
 	 *
 	 * @param \phpbb\event\data $event
 	 * @return null
-	 * @access public
 	 */
 	public function acp_add_config($event)
 	{
@@ -108,7 +104,6 @@ public function acp_add_config($event)
 	 *
 	 * @param \phpbb\event\data $event
 	 * @return null
-	 * @access public
 	 */
 	public function configure_textformatter($event)
 	{
@@ -117,21 +112,24 @@ public function configure_textformatter($event)
 
 		$condition = 'starts-with(@src, \'' . generate_board_url(true) . '\') or ($S_IMG_SECURE_URLS and starts-with(@src, \'https://\'))';
 
-		// Prepare fetched URL template
+		// Prepare URL template
 		$url_template = str_replace(array('@url', '<xsl:apply-templates/>'), array('@src', '<xsl:value-of select="$L_EXTIMGLINK"/>'), $configurator->tags['URL']->template);
 
 		$configurator->tags['IMG']->template = '<xsl:choose>'
 				. '<xsl:when test="' . $condition . '">' . $configurator->tags['IMG']->template . '</xsl:when>'
 				. '<xsl:otherwise>' . $url_template . '</xsl:otherwise>'
 			. '</xsl:choose>';
+
+		// Fix behaviour when [img] tag is within [url] tag
+		$configurator->tags['URL']->rules->allowChild('IMG');
+		$configurator->tags['URL']->rules->allowDescendant('IMG');
 	}
 
 	/**
 	 * Changes the regex replacement for second pass
 	 *
 	 * @param \phpbb\event\data $event
 	 * @return null
-	 * @access public
 	 */
 	public function modify_case_img($event)
 	{
@@ -178,7 +176,6 @@ public function modify_case_img($event)
 	 *
 	 * @param \phpbb\event\data $event
 	 * @return null
-	 * @access public
 	 */
 	public function setup_textformatter_renderer($event)
 	{