aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-07-02 16:53:40 -0700
committerfriendica <info@friendica.com>2014-07-02 16:53:40 -0700
commit7b1901c2c23468248ce1770a9e2df5047e6788a6 (patch)
tree66340d08a0540e9a80ed513debdee012eceb36b3
parentf949df6ec0ea01f1347d5eadf9756a8bd3c295b1 (diff)
downloadvolse-hubzilla-7b1901c2c23468248ce1770a9e2df5047e6788a6.tar.gz
volse-hubzilla-7b1901c2c23468248ce1770a9e2df5047e6788a6.tar.bz2
volse-hubzilla-7b1901c2c23468248ce1770a9e2df5047e6788a6.zip
turn that into a feature
-rw-r--r--include/features.php1
-rw-r--r--mod/item.php3
-rw-r--r--version.inc2
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