jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Logic error

Browse source
This commit is contained in:
Domovoy 2012-08-24 05:04:35 +02:00
parent 32bf36bf97
commit 5cd1dde59b
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/conversation.php
View file

@ -496,7 +496,6 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
if(strpos($tags, '@[url') !== FALSE) {
// We have at least one @ tag
$template = $wallwall_template;
$commentww = 'ww';
$matches = array();
preg_match_all('/\@\[url=([^\]]+)\]([^\[]+)\[\/url\]/', $tags, $matches, PREG_SET_ORDER);
@ -512,6 +511,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
$owner_url = zrl($r[0]['url']);
$owner_name = $r[0]['name'];
$owner_photo = $r[0]['photo'];
$commentww = 'ww';
break;
}
}
@ -522,6 +522,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
$owner_name = $matches[0][2];
// Use the nosign
$owner_photo = $a->get_baseurl() .'/images/nosign.jpg';
$commentww = 'ww';
}
}
}

3
object/Item.php
View file

@ -595,7 +595,6 @@ class Item extends BaseObject {
if(strpos($tags, '@[url') !== FALSE) {
// We have at least one @ tag
$this->set_template('wall2wall');
$this->wall_to_wall = true;
$matches = array();
preg_match_all('/\@\[url=([^\]]+)\]([^\[]+)\[\/url\]/', $tags, $matches, PREG_SET_ORDER);
@ -611,6 +610,7 @@ class Item extends BaseObject {
$this->owner_url = zrl($r[0]['url']);
$this->owner_name = $r[0]['name'];
$this->owner_photo = $r[0]['photo'];
$this->wall_to_wall = true;
break;
}
}
@ -621,6 +621,7 @@ class Item extends BaseObject {
$this->owner_name = $matches[0][2];
// Use the nosign
$this->owner_photo = $a->get_baseurl() .'/images/nosign.jpg';
$this->wall_to_wall = true;
}
}
}