diff options
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Article_edit.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Module/Connections.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Module/Item.php | 8 |
3 files changed, 7 insertions, 11 deletions
diff --git a/Zotlabs/Module/Article_edit.php b/Zotlabs/Module/Article_edit.php index d3cce343f..635b3ce2a 100644 --- a/Zotlabs/Module/Article_edit.php +++ b/Zotlabs/Module/Article_edit.php @@ -85,10 +85,9 @@ class Article_edit extends \Zotlabs\Web\Controller { $mimetype = $itm[0]['mimetype']; + $summary = (($itm[0]['summary']) ? '[summary]' . $itm[0]['summary'] . '[/summary]' . "\r\n" : ''); $content = $itm[0]['body']; - - $rp = 'articles/' . $channel['channel_address']; $x = array( @@ -110,7 +109,7 @@ class Article_edit extends \Zotlabs\Web\Controller { 'ptyp' => $itm[0]['type'], 'mimeselect' => false, 'mimetype' => $itm[0]['mimetype'], - 'body' => undo_post_tagging($content), + 'body' => $summary . undo_post_tagging($content), 'post_id' => $post_id, 'visitor' => true, 'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php index 7c8d71210..fd645d239 100644 --- a/Zotlabs/Module/Connections.php +++ b/Zotlabs/Module/Connections.php @@ -322,7 +322,10 @@ class Connections extends \Zotlabs\Web\Controller { 'ignore' => ((! $rr['abook_ignored']) ? t('Ignore') : false), 'recent_label' => t('Recent activity'), 'recentlink' => z_root() . '/network/?f=&cid=' . intval($rr['abook_id']) . '&name=' . $rr['xchan_name'], - 'oneway' => $oneway + 'oneway' => $oneway, + 'connect' => (intval($rr['abook_not_here']) ? t('Connect') : ''), + 'follow' => z_root() . '/follow/?f=&url=' . urlencode($rr['xchan_addr']) . '&interactive=0', + 'connect_hover' => t('Connect at this location') ); } } diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index d03b6ee30..cda8eabec 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -1232,13 +1232,7 @@ class Item extends Controller { killme(); } - if(($parent) && ($parent != $post_id)) { - // Store the comment signature information in case we need to relay to Diaspora - //$ditem = $datarray; - //$ditem['author'] = $observer; - //store_diaspora_comment_sig($ditem,$channel,$parent_item, $post_id, (($walltowall_comment) ? 1 : 0)); - } - else { + if(($parent == $post_id) || ($datarray['item_private'] == 1)) { $r = q("select * from item where id = %d", intval($post_id) ); |