diff options
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/items.php | 1 |
2 files changed, 1 insertions, 2 deletions
@@ -1379,7 +1379,7 @@ function activity_match($haystack,$needle) { if(! function_exists('get_tags')) { function get_tags($s) { $ret = array(); - if(preg_match_all('/([@#][^ ,:?]*)([ ,:?]|$)/',$s,$match)) { + if(preg_match_all('/([@#][^ \x0D\x0A,:?]*)([ \x0D\x0A,:?]|$)/',$s,$match)) { foreach($match[1] as $match) { if(strstr($match,"]")) { // we might be inside a bbcode color tag - leave it alone diff --git a/include/items.php b/include/items.php index 27cb01f25..cca9e0401 100644 --- a/include/items.php +++ b/include/items.php @@ -762,7 +762,6 @@ function consume_feed($xml,$importer,$contact, &$hub, $datedir = 0) { $feed->init(); // Check at the feed level for updated contact name and/or photo - $debugging = get_config('system','debugging'); $name_updated = ''; $new_name = ''; |