From d54b6099d248a2fa05bb21d7f1b822bbaa0421fa Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 19 Oct 2013 01:48:43 -0700
Subject: remove "via wall-To-Wall" text as it's soooo Facebook and is out of
 place in derived/sourced channels. It's now just "$author via $xyz".

---
 include/ItemObject.php | 1 +
 version.inc            | 2 +-
 view/tpl/conv_item.tpl | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/ItemObject.php b/include/ItemObject.php
index df9386232..fc99c50ad 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -201,6 +201,7 @@ class Item extends BaseObject {
 			'linktitle' => sprintf( t('View %s\'s profile - %s'), $profile_name, $item['author']['xchan_addr']),
 			'olinktitle' => sprintf( t('View %s\'s profile - %s'), $this->get_owner_name(), $item['owner']['xchan_addr']),
 			'to' => t('to'),
+			'via' => t('via'),
 			'wall' => t('Wall-to-Wall'),
 			'vwall' => t('via Wall-To-Wall:'),
 			'profile_url' => $profile_link,
diff --git a/version.inc b/version.inc
index be191a19a..7398de6a6 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-10-18.470
+2013-10-19.471
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index c44e2253a..095bd0df3 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -37,7 +37,7 @@
 			</div>
 		</div>
 		<div class="wall-item-author">
-				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
+				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}<br />
 
 				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i>&nbsp;{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div>
 		</div>			
-- 
cgit v1.2.3