Browse Source

no newlines in tags

pull/1/head
Friendika 12 years ago
parent
commit
34a8fb935d
  1. 2
      boot.php
  2. 1
      include/items.php

2
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

1
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 = '';

Loading…
Cancel
Save