From c0a7eaa53dc79bfe74de1ac1f6ee24fc83ffdf00 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 20 Sep 2019 18:00:29 -0700
Subject: [PATCH] exploratory development

---
 Zotlabs/Lib/Activity.php | 2 +-
 include/bbcode.php       | 3 +++
 include/help.php         | 2 +-
 include/text.php         | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 1d5e5118d..233c66dab 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -939,7 +939,7 @@ class Activity {
 		];
 		$ret['url'] = $p['xchan_url'];
 
-		if ($activitypub && $feature_complete) {	
+		if ($activitypub && get_config('system','activitypub')) {	
 
 			if ($c) {
 				$ret['inbox']       = z_root() . '/inbox/'     . $c['channel_address'];
diff --git a/include/bbcode.php b/include/bbcode.php
index ba703de3c..7fea5ac3d 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1424,6 +1424,9 @@ function bbcode($Text, $options = []) {
 
 	if($censored) {
 		$Text = separate_img_links($Text);
+
+		//@fixme make this work with OWA image links
+
 		$Text = preg_replace("/\<img(.*?)src=\"(.*?)\"(.*?)\>/ism",'<i class="fa fa-image"></i> <a href="#" onclick="\\$.colorbox({ \'href\': \'$2\' }); return false;">$2</a>',$Text);
 	}
 
diff --git a/include/help.php b/include/help.php
index d2a7a086f..70ff396ea 100644
--- a/include/help.php
+++ b/include/help.php
@@ -1,6 +1,6 @@
 <?php
 
-use \Michelf\MarkdownExtra;
+use Michelf\MarkdownExtra;
 
 
 /**
diff --git a/include/text.php b/include/text.php
index 018993053..9934de5de 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1632,6 +1632,7 @@ function prepare_body(&$item,$attach = false,$opts = false) {
 function separate_img_links($s) {
 	$x = preg_replace('/\<a (.*?)\>\<img(.*?)\>\<\/a\>/ism',
 		'<img$2><br><a $1>' . t('Link') . '</a><br>',$s);
+
 	return $x;
 }