diff options
| author | zotlabs <mike@macgirvin.com> | 2016-10-19 16:31:35 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-10-19 16:31:35 -0700 |
| commit | c79c1b391331ab7c8c0f01265a627ffae23d54e2 (patch) | |
| tree | 66d988e77e1af2b8695a9726a76fc7d5743a69a6 /include/conversation.php | |
| parent | 716a83d1f77e2d6f26b25ab03ffe130c11ef7feb (diff) | |
| parent | b926a4c67e4d7dcba01df91dddcc047abde246bb (diff) | |
| download | volse-hubzilla-c79c1b391331ab7c8c0f01265a627ffae23d54e2.tar.gz volse-hubzilla-c79c1b391331ab7c8c0f01265a627ffae23d54e2.tar.bz2 volse-hubzilla-c79c1b391331ab7c8c0f01265a627ffae23d54e2.zip | |
Merge branch 'dev' into pdo
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index 7239e603b..bc8f8ce8b 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -146,7 +146,7 @@ function localize_item(&$item){ case ACTIVITY_OBJ_NOTE: default: $post_type = t('status'); - if($obj['mid'] != $obj['parent_mid']) + if($obj['id'] != $obj['parent']) $post_type = t('comment'); break; } |