diff options
| -rw-r--r-- | include/features.php | 1 | ||||
| -rw-r--r-- | mod/item.php | 3 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/features.php b/include/features.php index ef5923a01..a2698cc72 100644 --- a/include/features.php +++ b/include/features.php @@ -39,6 +39,7 @@ function get_features() { 'composition' => array( 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('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')), diff --git a/mod/item.php b/mod/item.php index c346389e7..d4739244a 100644 --- a/mod/item.php +++ b/mod/item.php @@ -422,13 +422,12 @@ function item_post(&$a) { 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'); $body = diaspora2bb($body,true); } - // BBCODE alert: the following functions assume bbcode input // 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 diff --git a/version.inc b/version.inc index e70c648ee..265f47ba9 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-07-01.723 +2014-07-02.724 |