From: Domovoy <domovoy@errlock.org>
Date: Fri, 24 Aug 2012 03:04:35 +0000 (+0200)
Subject: Logic error
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5cd1dde59b7bfbd566df9e150498fa416e3b0cea;p=friendica.git

Logic error
---

diff --git a/include/conversation.php b/include/conversation.php
index be7327fbef..e74eb6b96b 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -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';
 						}
 					}
 				}
diff --git a/object/Item.php b/object/Item.php
index 1c7b8488f2..f89dcdcc16 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -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;
 				}
 			}
 		}