From ee35c06a8d138d14f1bf7c0d7fb710721709c3a9 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 20 Feb 2011 20:20:33 -0800
Subject: [PATCH] more punctuation characters added to linkify patterns

---
 boot.php           | 2 +-
 include/bbcode.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot.php b/boot.php
index 0b6aed2e70..d8abf06b04 100644
--- a/boot.php
+++ b/boot.php
@@ -2060,7 +2060,7 @@ function aes_encrypt($val,$ky)
 
 if(! function_exists('linkify')) {
 function linkify($s) {
-	$s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]*)/", ' <a href="$1" target="external-link">$1</a>', $s);
+	$s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%\$\!\+]*)/", ' <a href="$1" target="external-link">$1</a>', $s);
 	return($s);
 }}
 
diff --git a/include/bbcode.php b/include/bbcode.php
index c55ebab00c..978b4af692 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -22,7 +22,7 @@ function bbcode($Text) {
 	// Perform URL Search
 
 
-	$Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%\$\!]+)/", ' <a href="$2" target="external-link">$2</a>', $Text);
+	$Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%\$\!\+]+)/", ' <a href="$2" target="external-link">$2</a>', $Text);
 
 	$Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '<a href="$1" target="external-link">$1</a>', $Text);
 	$Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '<a href="$1" target="external-link">$2</a>', $Text);