From e2b6464f83313bd56c2d9c962e089d978927cdfd Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 29 Aug 2017 20:07:26 -0700
Subject: escape 'http' inside code blocks so it doesn't trigger an oembed

---
 include/bbcode.php | 3 +++
 include/text.php   | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'include')

diff --git a/include/bbcode.php b/include/bbcode.php
index 9f9b5c5e1..470854f06 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1255,6 +1255,9 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 		$Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim', $Text);
 	}
 
+	// replace escaped links in code= blocks
+	$Text = str_replace('%eY9-!','http', $Text);
+
 	$Text = preg_replace('/\[\&amp\;([#a-z0-9]+)\;\]/', '&$1;', $Text);
 
 	// fix any escaped ampersands that may have been converted into links
diff --git a/include/text.php b/include/text.php
index dd2dc7620..4b34364ce 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2986,6 +2986,8 @@ function text_highlight($s, $lang) {
 	else
 		$o = $s;
 
+	$o = str_replace('http','%eY9-!',$o);
+
 	return('<code>' . $o . '</code>');
 }
 
-- 
cgit v1.2.3