exploratory development

This commit is contained in:
zotlabs 2019-09-20 18:00:29 -07:00
parent 8d27732707
commit c0a7eaa53d
4 changed files with 6 additions and 2 deletions

View file

@ -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'];

View file

@ -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);
}

View file

@ -1,6 +1,6 @@
<?php
use \Michelf\MarkdownExtra;
use Michelf\MarkdownExtra;
/**

View file

@ -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;
}