Merge branch 'master' of https://github.com/friendica/red

3 files changed, 11 insertions, 4 deletions

diff --git a/mod/connedit.php b/mod/connedit.php
index 61bb62766..b9f0299e2 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -24,7 +24,7 @@ function connedit_init(&$a) {
 	if(! local_user())
 		return;
 
-	if((argc() == 2) && intval(argv(1))) {
+	if((argc() >= 2) && intval(argv(1))) {
 		$r = q("SELECT abook.*, xchan.* 
 			FROM abook left join xchan on abook_xchan = xchan_hash
 			WHERE abook_channel = %d and abook_id = %d LIMIT 1",
diff --git a/mod/item.php b/mod/item.php
index c9ec56eeb..c346389e7 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -375,7 +375,7 @@ function item_post(&$a) {
 			killme();
 		}
 	}
-
+	
 
 	$expires = '0000-00-00 00:00:00';
 
@@ -422,6 +422,13 @@ function item_post(&$a) {
 
 	if($mimetype === 'text/bbcode') {
 
+		if(local_user() && local_user() == $profile_uid && get_pconfig(local_user(),'editor','use_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/mod/tagger.php b/mod/tagger.php
index 3d8043f68..bfda114d2 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -98,9 +98,9 @@ function tagger_content(&$a) {
 	$bodyverb = t('%1$s tagged %2$s\'s %3$s with %4$s');
 
 	// saving here for reference
-	// also check out x22d5 and x0d6b and x0db8 and x24d0 and xff20 !!!
+	// also check out x22d5 and x2317 and x0d6b and x0db8 and x24d0 and xff20 !!!
 
-	$termlink = html_entity_decode('⌗') . '[zrl=' . $a->get_baseurl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/zrl]';
+	$termlink = html_entity_decode('⋕') . '[zrl=' . $a->get_baseurl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/zrl]';
 
 	$channel = $a->get_channel();