Version 3.4.8

upload/admin/sources/classes/text/parser/bbcode.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
  * BBCode parsing core - common methods
  * Last Updated: $Date: 2012-06-08 09:28:02 +0100 (Fri, 08 Jun 2012) $
  * </pre>
@@ -399,7 +399,7 @@ class class_text_parser_bbcode extends classes_text_parser
 		/* Fix old expression "protection" */
 		$txt	= str_replace( "exp<b></b>ression", "expression", $txt );
 
-		/* Convert to BR */
+		/* Convert to BR, but only if we're not working towards an editor */
 		$txt = nl2br( $txt );
 		
 		/* Restore preserved newlines */
@@ -419,6 +419,7 @@ class class_text_parser_bbcode extends classes_text_parser
 		$txt = str_replace( '</pre><br />', '</pre>', $txt );
 		$txt = str_replace( '</div><br />', '</div>', $txt );
 		$txt = str_replace( '</blockquote><br />', '</blockquote>', $txt );
+		$txt = str_replace( '<p><br />', '<p>', $txt );
 		
 		// Don't auto-link media.
 		parent::$NoMediaAutoLinkify = true;
@@ -1367,6 +1368,7 @@ class class_text_parser_bbcode extends classes_text_parser
 				if ( ! $this->isAllowedUrl( $url ) )
 				{
 					/* Unlink */
+					$url = $this->parseBadWords( $url, FALSE );
 					$txt = str_replace( $raw, $url, $txt );
 				}