From 63683734a21e90149c464f7e9b03e7aedc29868e Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 18 Mar 2015 19:06:05 -0700
Subject: make the channel item query match recent changes to network item
 query (and some slightly older changes in display item query), and allow '@'
 in linkified urls.

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

(limited to 'include')

diff --git a/include/bbcode.php b/include/bbcode.php
index 32e5d014f..6f7ef8973 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -469,7 +469,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 
 	// Perform URL Search
 
-	$urlchars = '[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]';
+	$urlchars = '[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,\@]';
 
 	if (strpos($Text,'http') !== false) {
 		$Text = preg_replace("/([^\]\='".'"'."\/]|^|\#\^)(https?\:\/\/$urlchars+)/ism", '$1<a href="$2" >$2</a>', $Text);
diff --git a/include/text.php b/include/text.php
index 7468a3622..54d8b2ad7 100644
--- a/include/text.php
+++ b/include/text.php
@@ -869,7 +869,7 @@ function valid_email($x){
 
 
 function linkify($s,$me = false) {
-	$s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\@\~\#\'\%\$\!\+]*)/", (($me) ? ' <a href="$1" rel="me" >$1</a>' : ' <a href="$1" >$1</a>'), $s);
+	$s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\@\~\#\'\%\$\!\+\,\@]*)/", (($me) ? ' <a href="$1" rel="me" >$1</a>' : ' <a href="$1" >$1</a>'), $s);
 	$s = preg_replace("/\<(.*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$s);
 	return($s);
 }
-- 
cgit v1.2.3