From 0e57b6cc8c8ad02c06457f96abae3227805c37ef Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 31 Jul 2014 02:33:34 -0700
Subject: convert application strings to en-US

---
 include/contact_selectors.php | 4 +++-
 include/conversation.php      | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index a3cfd2489..726efce9d 100644
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -20,6 +20,7 @@ function contact_profile_assign($current) {
 	return $o;
 }
 
+/* unused currently
 
 function contact_reputation($current) {
 
@@ -27,7 +28,7 @@ function contact_reputation($current) {
 	$o .= "<select id=\"contact-reputation-selector\" name=\"reputation\" />\r\n";
 
 	$rep = array(
-		0 => t('Unknown | Not categorised'),
+		0 => t('Unknown | Not categorized'),
 		1 => t('Block immediately'),
 		2 => t('Shady, spammer, self-marketer'),
 		3 => t('Known to me, but no opinion'),
@@ -43,6 +44,7 @@ function contact_reputation($current) {
 	return $o;
 }
 
+*/
 
 function contact_poll_interval($current, $disabled = false) {
 
diff --git a/include/conversation.php b/include/conversation.php
index 5481037e7..c0d0c1e7d 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -179,8 +179,8 @@ function localize_item(&$item){
 
 	if (activity_match($item['verb'],ACTIVITY_FRIEND)) {
 
-
-//		if ($item['obj_type']=="" || $item['obj_type']!== ACTIVITY_OBJ_PERSON) return;
+		if ($item['obj_type'] == "" || $item['obj_type'] !== ACTIVITY_OBJ_PERSON) 
+			return;
 
 		$Aname = $item['author']['xchan_name'];
 		$Alink = $item['author']['xchan_url'];
-- 
cgit v1.2.3