From 34a8fb935d9619c5114981862dfe2949a90f09bb Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 28 Nov 2010 14:43:14 -0800
Subject: [PATCH] no newlines in tags

---
 boot.php          | 2 +-
 include/items.php | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/boot.php b/boot.php
index c5ce3bed32..3c319d7b77 100644
--- 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 27cb01f250..cca9e0401d 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 = '';