diff options
| author | Jeroen <jeroenpraat@xs4all.nl> | 2014-07-31 12:51:09 +0000 |
|---|---|---|
| committer | Jeroen <jeroenpraat@xs4all.nl> | 2014-07-31 12:51:09 +0000 |
| commit | d126d02c659327188e5bd50447506ad16a4875bb (patch) | |
| tree | 1e7ad2ca42f48936ab0c2bd4eb36a0695b22033d /include | |
| parent | c4e82772c04926696d0ca8d5a7e75476f77cb904 (diff) | |
| parent | 56bbf583389eae33b138e81f1e5b3cc71ae41218 (diff) | |
| download | volse-hubzilla-d126d02c659327188e5bd50447506ad16a4875bb.tar.gz volse-hubzilla-d126d02c659327188e5bd50447506ad16a4875bb.tar.bz2 volse-hubzilla-d126d02c659327188e5bd50447506ad16a4875bb.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include')
| -rw-r--r-- | include/contact_selectors.php | 4 | ||||
| -rw-r--r-- | include/conversation.php | 4 |
2 files changed, 5 insertions, 3 deletions
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']; |