friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Logic error

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) { if(strpos($tags, '@[url') !== FALSE) {
// We have at least one @ tag // We have at least one @ tag
$template = $wallwall_template; $template = $wallwall_template;
$commentww = 'ww';
$matches = array(); $matches = array();
preg_match_all('/\@\[url=([^\]]+)\]([^\[]+)\[\/url\]/', $tags, $matches, PREG_SET_ORDER); 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_url = zrl($r[0]['url']);
$owner_name = $r[0]['name']; $owner_name = $r[0]['name'];
$owner_photo = $r[0]['photo']; $owner_photo = $r[0]['photo'];
$commentww = 'ww';
break; break;
} }
} }
@ -522,6 +522,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
$owner_name = $matches[0][2]; $owner_name = $matches[0][2];
// Use the nosign // Use the nosign
$owner_photo = $a->get_baseurl() .'/images/nosign.jpg'; $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) { if(strpos($tags, '@[url') !== FALSE) {
// We have at least one @ tag // We have at least one @ tag
$this->set_template('wall2wall'); $this->set_template('wall2wall');
$this->wall_to_wall = true;
$matches = array(); $matches = array();
preg_match_all('/\@\[url=([^\]]+)\]([^\[]+)\[\/url\]/', $tags, $matches, PREG_SET_ORDER); 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_url = zrl($r[0]['url']);
$this->owner_name = $r[0]['name']; $this->owner_name = $r[0]['name'];
$this->owner_photo = $r[0]['photo']; $this->owner_photo = $r[0]['photo'];
$this->wall_to_wall = true;
break; break;
} }
} }
@ -621,6 +621,7 @@ class Item extends BaseObject {
$this->owner_name = $matches[0][2]; $this->owner_name = $matches[0][2];
// Use the nosign // Use the nosign
$this->owner_photo = $a->get_baseurl() .'/images/nosign.jpg'; $this->owner_photo = $a->get_baseurl() .'/images/nosign.jpg';
$this->wall_to_wall = true;
} }
} }
} }