friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

no newlines in tags

This commit is contained in:
Friendika 2010-11-28 14:43:14 -08:00
parent 9a921b829b
commit 34a8fb935d
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -1379,7 +1379,7 @@ function activity_match($haystack,$needle) {
if(! function_exists('get_tags')) { if(! function_exists('get_tags')) {
function get_tags($s) { function get_tags($s) {
$ret = array(); $ret = array();
if(preg_match_all('/([@#][^ ,:?]*)([ ,:?]|$)/',$s,$match)) { if(preg_match_all('/([@#][^ \x0D\x0A,:?]*)([ \x0D\x0A,:?]|$)/',$s,$match)) {
foreach($match[1] as $match) { foreach($match[1] as $match) {
if(strstr($match,"]")) { if(strstr($match,"]")) {
// we might be inside a bbcode color tag - leave it alone // we might be inside a bbcode color tag - leave it alone

1
include/items.php
View File

@ -762,7 +762,6 @@ function consume_feed($xml,$importer,$contact, &$hub, $datedir = 0) {
$feed->init(); $feed->init();
// Check at the feed level for updated contact name and/or photo // Check at the feed level for updated contact name and/or photo
$debugging = get_config('system','debugging');
$name_updated = ''; $name_updated = '';
$new_name = ''; $new_name = '';