no newlines in tags

diff --git a/boot.php b/boot.php
index c5ce3bed32248dd6850cb72067e0378fa256c540..3c319d7b773dc6f2bfaba6540152e19750eda41b 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -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 27cb01f2503a403c18ed3f55f61432b338d5bde6..cca9e0401d9086b7ec495e760edc567c6a6fb8fc 100644 (file)
--- 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 = '';