diff options
| author | friendica <info@friendica.com> | 2015-03-18 19:06:05 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-18 19:06:05 -0700 |
| commit | 63683734a21e90149c464f7e9b03e7aedc29868e (patch) | |
| tree | 5b58e4d227da6638f7a841a5b62a080646e53bba | |
| parent | 5a7e35fbf8e70f04e4253e5cc2a79925cd3385d1 (diff) | |
| download | volse-hubzilla-63683734a21e90149c464f7e9b03e7aedc29868e.tar.gz volse-hubzilla-63683734a21e90149c464f7e9b03e7aedc29868e.tar.bz2 volse-hubzilla-63683734a21e90149c464f7e9b03e7aedc29868e.zip | |
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.
| -rw-r--r-- | include/bbcode.php | 2 | ||||
| -rw-r--r-- | include/text.php | 2 | ||||
| -rw-r--r-- | mod/channel.php | 8 |
3 files changed, 7 insertions, 5 deletions
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)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$s); return($s); } diff --git a/mod/channel.php b/mod/channel.php index 2a0373a81..9df400cbe 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -149,17 +149,19 @@ function channel_content(&$a, $update = 0, $load = false) { $page_mode = 'client'; + $abook_uids = " and abook.abook_channel = " . intval($a->profile['profile_uid']) . " "; + if(($update) && (! $load)) { if ($mid) { - $r = q("SELECT parent AS item_id from item where mid = '%s' and uid = %d AND item_restrict = 0 + $r = q("SELECT parent AS item_id from item where mid like '%s' and uid = %d AND item_restrict = 0 AND (item_flags & %d) > 0 AND item_unseen = 1 $sql_extra limit 1", - dbesc($mid), + dbesc($mid . '%'), intval($a->profile['profile_uid']), intval(ITEM_WALL) ); } else { $r = q("SELECT distinct parent AS `item_id`, created from item - left join abook on item.author_xchan = abook.abook_xchan + left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids ) WHERE uid = %d AND item_restrict = 0 AND (item_flags & %d) > 0 AND item_unseen = 1 AND ((abook.abook_flags & %d) = 0 or abook.abook_flags is null) |