aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-12-17 01:56:17 -0800
committerfriendica <info@friendica.com>2014-12-17 01:56:17 -0800
commit4e1dbc13d47c432ef6bb52137ec85d84c5da964d (patch)
treeb74469d9466d7f5d5a34c25cee99d4d5ee81908a
parenteebb6f23fb82c8b81f5c1c8fd6e7210e9275fe35 (diff)
parente1999ada58b7194f0184435f4b7b736160cc28e1 (diff)
downloadvolse-hubzilla-4e1dbc13d47c432ef6bb52137ec85d84c5da964d.tar.gz
volse-hubzilla-4e1dbc13d47c432ef6bb52137ec85d84c5da964d.tar.bz2
volse-hubzilla-4e1dbc13d47c432ef6bb52137ec85d84c5da964d.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--include/ItemObject.php4
-rw-r--r--include/conversation.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php
index 68d037722..ec8116297 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -292,7 +292,7 @@ class Item extends BaseObject {
'share' => $share,
'rawmid' => $item['mid'],
'plink' => get_plink($item),
- 'edpost' => true, // ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''),
+ 'edpost' => $edpost, // ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''),
'star' => ((feature_enabled($conv->get_profile_owner(),'star_posts')) ? $star : ''),
'tagger' => ((feature_enabled($conv->get_profile_owner(),'commtag')) ? $tagger : ''),
'filer' => ((feature_enabled($conv->get_profile_owner(),'filing')) ? $filer : ''),
@@ -635,7 +635,7 @@ class Item extends BaseObject {
'$edimg' => t('Image'),
'$edurl' => t('Link'),
'$edvideo' => t('Video'),
- '$preview' => true, // ((feature_enabled($conv->get_profile_owner(),'preview')) ? t('Preview') : ''),
+ '$preview' => t('Preview'), // ((feature_enabled($conv->get_profile_owner(),'preview')) ? t('Preview') : ''),
'$indent' => $indent,
'$feature_encrypt' => ((feature_enabled($conv->get_profile_owner(),'content_encrypt')) ? true : false),
'$encrypt' => t('Encrypt text'),
diff --git a/include/conversation.php b/include/conversation.php
index 7ce67e694..a2fb3d162 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1099,7 +1099,7 @@ function status_editor($a,$x,$popup=false) {
$jotplugins = '';
$jotnets = '';
- $preview = true;
+ $preview = t('Preview');
// $preview = ((feature_enabled($x['profile_uid'],'preview')) ? t('Preview') : '');
if(x($x,'nopreview'))
$preview = '';