diff options
| author | friendica <info@friendica.com> | 2014-12-16 14:28:07 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-12-16 14:28:07 -0800 |
| commit | 5b492110354f8cd647f03999de56f9f1643bcfd6 (patch) | |
| tree | 1e6d0673db3c3a923d4bbbbea318049558bb1a94 /include | |
| parent | 7bee4e5997804658f508a32d07ca4143d8afe629 (diff) | |
| download | volse-hubzilla-5b492110354f8cd647f03999de56f9f1643bcfd6.tar.gz volse-hubzilla-5b492110354f8cd647f03999de56f9f1643bcfd6.tar.bz2 volse-hubzilla-5b492110354f8cd647f03999de56f9f1643bcfd6.zip | |
edit and preview removed from additional features and turned into core functionality (always enabled).
Diffstat (limited to 'include')
| -rw-r--r-- | include/ItemObject.php | 4 | ||||
| -rw-r--r-- | include/conversation.php | 5 | ||||
| -rw-r--r-- | include/features.php | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index 6f177b606..68d037722 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' => ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''), + 'edpost' => true, // ((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' => ((feature_enabled($conv->get_profile_owner(),'preview')) ? t('Preview') : ''), + '$preview' => true, // ((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 b9419acde..7ce67e694 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -666,7 +666,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ $body = prepare_body($item,true); - //$tmp_item = replace_macros($tpl,array( $tmp_item = array( 'template' => $tpl, 'toplevel' => 'toplevel_item', @@ -1100,8 +1099,8 @@ function status_editor($a,$x,$popup=false) { $jotplugins = ''; $jotnets = ''; - - $preview = ((feature_enabled($x['profile_uid'],'preview')) ? t('Preview') : ''); + $preview = true; +// $preview = ((feature_enabled($x['profile_uid'],'preview')) ? t('Preview') : ''); if(x($x,'nopreview')) $preview = ''; diff --git a/include/features.php b/include/features.php index 92d8598a5..7009b1d6b 100644 --- a/include/features.php +++ b/include/features.php @@ -45,7 +45,7 @@ function get_features() { t('Post Composition Features'), // array('richtext', t('Richtext Editor'), t('Enable richtext editor')), array('markdown', t('Use Markdown'), t('Allow use of "Markdown" to format posts')), - array('preview', t('Post Preview'), t('Allow previewing posts and comments before publishing them')), +// array('preview', t('Post Preview'), t('Allow previewing posts and comments before publishing them')), array('channel_sources', t('Channel Sources'), t('Automatically import channel content from other channels or feeds')), array('content_encrypt', t('Even More Encryption'), t('Allow optional encryption of content end-to-end with a shared secret key')), array('adult_photo_flagging', t('Flag Adult Photos'), t('Provide photo edit option to hide adult photos from default album view')), @@ -67,7 +67,7 @@ function get_features() { 'tools' => array( t('Post/Comment Tools'), // array('multi_delete', t('Multiple Deletion'), t('Select and delete multiple posts/comments at once')), - array('edit_posts', t('Edit Sent Posts'), t('Edit and correct posts and comments after sending')), +// array('edit_posts', t('Edit Sent Posts'), t('Edit and correct posts and comments after sending')), array('commtag', t('Tagging'), t('Ability to tag existing posts')), array('categories', t('Post Categories'), t('Add categories to your posts')), array('filing', t('Saved Folders'), t('Ability to file posts under folders')), |