Version 4.3.6

system/Text/LegacyParser.php

@@ -546,7 +546,7 @@ class _LegacyParser
 						try
 						{
 							$album = \IPS\gallery\Album::constructFromData( \IPS\Db::i()->select( '*', 'gallery_albums', array( 'album_id=?', (int) $matches[3] ) )->first() );
-							return \IPS\Text\Parser::embeddableMedia( \IPS\Http\Url::createFromString( $album->url(), FALSE, TRUE ) );
+							return \IPS\Text\Parser::embeddableMedia( \IPS\Http\Url::createFromString( $album->url(), TRUE, TRUE ) );
 						}
 						catch( \Exception $e )
 						{
@@ -743,7 +743,7 @@ class _LegacyParser
 		/* Parse standard URLs */
 		preg_match_all( '#(?:^|\s|\)|\(|\{|\}|/>|>|\]|\[|;|href=\S)((http|https|news|ftp)://(?:[^<>\)\[\"\s]+|[a-zA-Z0-9/\._\-!&\#;,%\+\?:=]+))#is', $value, $matches );
 
-		foreach( $matches[1] as $m )
+		foreach( $matches[1] as $k => $m )
 		{
 			$me = null;
 
@@ -775,13 +775,12 @@ class _LegacyParser
 			if( $me )
 			{
 				$embedCount++;
+			}
 
-				$value = preg_replace( '/' . preg_quote( $m, '/' ) . '/i', $me, $value, 1 );
-			}
-			else
-			{
-				$value = preg_replace( '/' . preg_quote( $m, '/' ) . '/i', "<a href='{$m}'>{$m}</a>", $value, 1 );
-			}
+			$c = count( $urls );
+			$urls[ $c ] = $me ?: "<a href='{$m}'>{$m}</a>";
+			
+			$value = str_replace( $matches[1][ $k ], '<!--url{' . $c . '}-->', $value );
 		}
 
 		foreach( $urls as $k => $v )