harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edit and preview removed from additional features and turned into core functionality (always enabled).

Browse Source
This commit is contained in:
friendica 2014-12-16 14:28:07 -08:00
parent 7bee4e5997
commit 5b49211035
7 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/ItemObject.php
View File

@ -292,7 +292,7 @@ class Item extends BaseObject {
'share' => $share, 'share' => $share,
'rawmid' => $item['mid'], 'rawmid' => $item['mid'],
'plink' => get_plink($item), '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 : ''), 'star' => ((feature_enabled($conv->get_profile_owner(),'star_posts')) ? $star : ''),
'tagger' => ((feature_enabled($conv->get_profile_owner(),'commtag')) ? $tagger : ''), 'tagger' => ((feature_enabled($conv->get_profile_owner(),'commtag')) ? $tagger : ''),
'filer' => ((feature_enabled($conv->get_profile_owner(),'filing')) ? $filer : ''), 'filer' => ((feature_enabled($conv->get_profile_owner(),'filing')) ? $filer : ''),
@ -635,7 +635,7 @@ class Item extends BaseObject {
'$edimg' => t('Image'), '$edimg' => t('Image'),
'$edurl' => t('Link'), '$edurl' => t('Link'),
'$edvideo' => t('Video'), '$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, '$indent' => $indent,
'$feature_encrypt' => ((feature_enabled($conv->get_profile_owner(),'content_encrypt')) ? true : false), '$feature_encrypt' => ((feature_enabled($conv->get_profile_owner(),'content_encrypt')) ? true : false),
'$encrypt' => t('Encrypt text'), '$encrypt' => t('Encrypt text'),

5
include/conversation.php
View File

@ -666,7 +666,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
$body = prepare_body($item,true); $body = prepare_body($item,true);
//$tmp_item = replace_macros($tpl,array(
$tmp_item = array( $tmp_item = array(
'template' => $tpl, 'template' => $tpl,
'toplevel' => 'toplevel_item', 'toplevel' => 'toplevel_item',
@ -1100,8 +1099,8 @@ function status_editor($a,$x,$popup=false) {
$jotplugins = ''; $jotplugins = '';
$jotnets = ''; $jotnets = '';
$preview = true;
$preview = ((feature_enabled($x['profile_uid'],'preview')) ? t('Preview') : ''); // $preview = ((feature_enabled($x['profile_uid'],'preview')) ? t('Preview') : '');
if(x($x,'nopreview')) if(x($x,'nopreview'))
$preview = ''; $preview = '';

4
include/features.php
View File

@ -45,7 +45,7 @@ function get_features() {
t('Post Composition Features'), t('Post Composition Features'),
// array('richtext', t('Richtext Editor'), t('Enable richtext editor')), // array('richtext', t('Richtext Editor'), t('Enable richtext editor')),
array('markdown', t('Use Markdown'), t('Allow use of "Markdown" to format posts')), 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('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('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')), 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( 'tools' => array(
t('Post/Comment Tools'), t('Post/Comment Tools'),
// array('multi_delete', t('Multiple Deletion'), t('Select and delete multiple posts/comments at once')), // 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('commtag', t('Tagging'), t('Ability to tag existing posts')),
array('categories', t('Post Categories'), t('Add categories to your posts')), array('categories', t('Post Categories'), t('Add categories to your posts')),
array('filing', t('Saved Folders'), t('Ability to file posts under folders')), array('filing', t('Saved Folders'), t('Ability to file posts under folders')),

2
mod/editblock.php
View File

@ -170,7 +170,7 @@ function editblock_content(&$a) {
'$acl' => '', '$acl' => '',
'$bang' => '', '$bang' => '',
'$profile_uid' => (intval($channel['channel_id'])), '$profile_uid' => (intval($channel['channel_id'])),
'$preview' => ((feature_enabled($uid,'preview')) ? t('Preview') : ''), '$preview' => true, // ((feature_enabled($uid,'preview')) ? t('Preview') : ''),
'$jotplugins' => $jotplugins, '$jotplugins' => $jotplugins,
'$sourceapp' => $itm[0]['app'], '$sourceapp' => $itm[0]['app'],
'$defexpire' => '', '$defexpire' => '',

2
mod/editlayout.php
View File

@ -165,7 +165,7 @@ function editlayout_content(&$a) {
'$acl' => '', '$acl' => '',
'$bang' => '', '$bang' => '',
'$profile_uid' => (intval($owner)), '$profile_uid' => (intval($owner)),
'$preview' => ((feature_enabled($uid,'preview')) ? t('Preview') : ''), '$preview' => true, // ((feature_enabled($uid,'preview')) ? t('Preview') : ''),
'$jotplugins' => $jotplugins, '$jotplugins' => $jotplugins,
'$sourceapp' => t($a->sourcename), '$sourceapp' => t($a->sourcename),
'$defexpire' => '', '$defexpire' => '',

2
mod/editpost.php
View File

@ -137,7 +137,7 @@ function editpost_content(&$a) {
'$acl' => '', '$acl' => '',
'$bang' => '', '$bang' => '',
'$profile_uid' => local_user(), '$profile_uid' => local_user(),
'$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''), '$preview' => true, // ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''),
'$jotplugins' => $jotplugins, '$jotplugins' => $jotplugins,
'$sourceapp' => t($a->sourcename), '$sourceapp' => t($a->sourcename),
'$catsenabled' => $catsenabled, '$catsenabled' => $catsenabled,

2
mod/editwebpage.php
View File

@ -202,7 +202,7 @@ function editwebpage_content(&$a) {
'lockstate' => (((strlen($itm[0]['allow_cid'])) || (strlen($itm[0]['allow_gid'])) || (strlen($itm[0]['deny_cid'])) || (strlen($itm[0]['deny_gid']))) ? 'lock' : 'unlock'), 'lockstate' => (((strlen($itm[0]['allow_cid'])) || (strlen($itm[0]['allow_gid'])) || (strlen($itm[0]['deny_cid'])) || (strlen($itm[0]['deny_gid']))) ? 'lock' : 'unlock'),
'$bang' => '', '$bang' => '',
'$profile_uid' => (intval($owner)), '$profile_uid' => (intval($owner)),
'$preview' => ((feature_enabled($uid,'preview')) ? t('Preview') : ''), '$preview' => true, // ((feature_enabled($uid,'preview')) ? t('Preview') : ''),
'$jotplugins' => $jotplugins, '$jotplugins' => $jotplugins,
'$sourceapp' => $a->sourcename, '$sourceapp' => $a->sourcename,
'$defexpire' => '', '$defexpire' => '',