Merge branch 'master' into fix-code-and-quote-element

Author: FSD-Christian-ADM

BBCodePlus/BBCodePlus.php

@@ -298,11 +298,10 @@ function string_process_bbcode( $p_string, $p_multiline = TRUE ) {
          if ( ON == $this->t_MantisCoreFormatting_process_urls ) {
             $p_string = string_strip_hrefs( $p_string );
          }
-
+         
          # convert url-strings into links
-         $p_string = preg_replace( "/^((http|https|ftp|file):\/\/[a-z0-9;\/\?:@=\&\$\-_\.\+!*'\(\),~%#\|]+)/i", "[url]$1[/url]", $p_string );
-         $p_string = preg_replace( "/([^='\"(\[url\]|\[img\])])((http|https|ftp|file):\/\/[a-z0-9;\/\?:@=\&\$\-_\.\+!*'\(\),~%#\|]+)/i", "$1[url]$2[/url]", $p_string );
-
+         $p_string = preg_replace( "/^((https?|s?ftp|file|irc[6s]?|ssh|telnet|nntp|git|svn(?:\+ssh)?|cvs|mailto):\/\/[a-z0-9;\/\?:@=\&\$\-_\.\+!*'\(\),~%#\|]+)/i", "[url]$1[/url]", $p_string );
+         $p_string = preg_replace( "/([^='\"(\[url\]|\[img\])])((https?|s?ftp|file|irc[6s]?|ssh|telnet|nntp|git|svn(?:\+ssh)?|cvs|mailto):\/\/[a-z0-9;\/\?:@=\&\$\-_\.\+!*'\(\),~%#\|]+)/i", "$1[url]$2[/url]", $p_string );
 
          # if mantis core formatting plugin process text feature is off, we need to sanitize the html,
          # for safety. this is the only functionality we will support when the MantisCoreFormatting plugin is

README.md

@@ -28,7 +28,7 @@ If you would like to contribute to BBCode plus, please [read this guide first](h
 
 ### 2.1.11
 
-- Fixed display of quotes when quotee's name contains unicode characters, commas or single quotes [@FSD-Christian-ISS](https://github.com/FSD-Christian-ISS)
+- Fixed issue with additional protocols in link insertion.
 
 ### 2.1.10