Merge pull request #3319 from Hypolite/issue/#3316

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 36eded8e8afe1b54ca69b949a6f7228f04adfb24..93c42cd7b183eed4d6003feaf53ae934f99b0229 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -416,8 +416,8 @@ These Fields are not added below (yet). They are here to for bug search.
 `item`.`shadow`,
 */
 
-       return "`item`.`author-link`, `item`.`author-name`, `item`.`author-avatar`,
-               `item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`,
+       return "`item`.`author-id`, `item`.`author-link`, `item`.`author-name`, `item`.`author-avatar`,
+               `item`.`owner-id`, `item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`,
                `item`.`contact-id`, `item`.`uid`, `item`.`id`, `item`.`parent`,
                `item`.`uri`, `item`.`thr-parent`, `item`.`parent-uri`,
                `item`.`commented`, `item`.`created`, `item`.`edited`,
@@ -466,7 +466,7 @@ function item_condition() {
  */
 
 if(!function_exists('conversation')) {
-function conversation(&$a, $items, $mode, $update, $preview = false) {
+function conversation(App $a, $items, $mode, $update, $preview = false) {
 
        require_once('include/bbcode.php');
        require_once('include/Contact.php');
@@ -1066,8 +1066,9 @@ function builtin_activity_puller($item, &$conv_responses) {
                        else
                                $conv_responses[$mode][$item['thr-parent']] ++;
 
-                       if((local_user()) && (local_user() == $item['uid']) && ($item['self']))
+                       if (public_contact() == $item['author-id']) {
                                $conv_responses[$mode][$item['thr-parent'] . '-self'] = 1;
+                       }
 
                        $conv_responses[$mode][$item['thr-parent'] . '-l'][] = $url;
 
@@ -1170,23 +1171,14 @@ function format_like($cnt,$arr,$type,$id) {
 
 
 function status_editor($a,$x, $notes_cid = 0, $popup=false) {
-
        $o = '';
 
        $geotag = (($x['allow_location']) ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : '');
 
-/*     $plaintext = false;
-       if( local_user() && (intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled(local_user(),'richtext')) )
-               $plaintext = true;*/
-       $plaintext = true;
-       if( local_user() && feature_enabled(local_user(),'richtext') )
-               $plaintext = false;
-
        $tpl = get_markup_template('jot-header.tpl');
        $a->page['htmlhead'] .= replace_macros($tpl, array(
                '$newpost' => 'true',
                '$baseurl' => App::get_baseurl(true),
-               '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
                '$geotag' => $geotag,
                '$nickname' => $x['nickname'],
                '$ispublic' => t('Visible to <strong>everybody</strong>'),
@@ -1199,12 +1191,10 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
                '$delitems' => t('Delete item(s)?')
        ));
 
-
        $tpl = get_markup_template('jot-end.tpl');
        $a->page['end'] .= replace_macros($tpl, array(
                '$newpost' => 'true',
                '$baseurl' => App::get_baseurl(true),
-               '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
                '$geotag' => $geotag,
                '$nickname' => $x['nickname'],
                '$ispublic' => t('Visible to <strong>everybody</strong>'),