diff options
| -rw-r--r-- | Zotlabs/Update/_1219.php | 26 | ||||
| -rwxr-xr-x | boot.php | 2 | ||||
| -rw-r--r-- | include/markdown.php | 5 | ||||
| -rw-r--r-- | include/zot.php | 1 |
4 files changed, 32 insertions, 2 deletions
diff --git a/Zotlabs/Update/_1219.php b/Zotlabs/Update/_1219.php new file mode 100644 index 000000000..be2534001 --- /dev/null +++ b/Zotlabs/Update/_1219.php @@ -0,0 +1,26 @@ +<?php + +namespace Zotlabs\Update; + +class _1219 { + + function run() { + q("START TRANSACTION"); + + $r = q("DELETE FROM xchan WHERE + xchan_hash like '%s' AND + xchan_network = 'activitypub'", + dbesc(z_root()) . '%' + ); + + if($r) { + q("COMMIT"); + return UPDATE_SUCCESS; + } + else { + q("ROLLBACK"); + return UPDATE_FAILED; + } + } + +} @@ -54,7 +54,7 @@ define ( 'STD_VERSION', '3.7.1' ); define ( 'ZOT_REVISION', '6.0a' ); -define ( 'DB_UPDATE_VERSION', 1218 ); +define ( 'DB_UPDATE_VERSION', 1219 ); define ( 'PROJECT_BASE', __DIR__ ); diff --git a/include/markdown.php b/include/markdown.php index f4944e2cc..e5f5b9369 100644 --- a/include/markdown.php +++ b/include/markdown.php @@ -255,6 +255,9 @@ function bb_to_markdown($Text, $options = []) { $Text = html2markdown($Text); + //html2markdown adds backslashes infront of hashes after a new line. remove them + $Text = str_replace("\n\#", "\n#", $Text); + // It also adds backslashes to our attempt at getting around the html entity preservation for some weird reason. //$Text = str_replace(array('&\\_lt\\_;','&\\_gt\\_;','&\\_amp\\_;'),array('<','>','&'),$Text); @@ -374,4 +377,4 @@ class TableConverter implements ConverterInterface { return array('table', 'tr', 'thead', 'td', 'tbody'); } -}
\ No newline at end of file +} diff --git a/include/zot.php b/include/zot.php index 5c79dd4fa..52102e147 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1118,6 +1118,7 @@ function zot_process_response($hub, $arr, $outq) { } foreach($x['delivery_report'] as $xx) { + call_hooks('dreport_process',$xx); if(is_array($xx) && array_key_exists('message_id',$xx) && delivery_report_is_storable($xx)) { q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan ) values ( '%s', '%s','%s','%s','%s','%s' ) ", dbesc($xx['message_id']), |