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

turn that into a feature

Browse Source
This commit is contained in:
friendica 2014-07-02 16:53:40 -07:00
parent f949df6ec0
commit 7b1901c2c2
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/features.php
View File

@ -39,6 +39,7 @@ function get_features() {
'composition' => array( 'composition' => array(
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('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')),

3
mod/item.php
View File

@ -422,13 +422,12 @@ function item_post(&$a) {
if($mimetype === 'text/bbcode') { if($mimetype === 'text/bbcode') {
if(local_user() && local_user() == $profile_uid && get_pconfig(local_user(),'editor','use_markdown')) { if(local_user() && local_user() == $profile_uid && feature_enabled(local_user(),'markdown')) {
require_once('include/bb2diaspora.php'); require_once('include/bb2diaspora.php');
$body = diaspora2bb($body,true); $body = diaspora2bb($body,true);
} }
// BBCODE alert: the following functions assume bbcode input // BBCODE alert: the following functions assume bbcode input
// and will require alternatives for alternative content-types (text/html, text/markdown, text/plain, etc.) // and will require alternatives for alternative content-types (text/html, text/markdown, text/plain, etc.)
// we may need virtual or template classes to implement the possible alternatives // we may need virtual or template classes to implement the possible alternatives

2
version.inc
View File

@ -1 +1 @@
2014-07-01.723 2014-07-02.724