Remove our shortcodes from the original ones to avoid running them multiple times

gogdzl · gogdzl · commit 455514ecc416 · 2023-08-14T09:51:51.000-03:00
diff --git a/syntaxhighlighter.php b/syntaxhighlighter.php
@@ -659,8 +659,8 @@ function shortcode_hack( $content, $callback, $ignore_html = true ) {
 			return $content;
 		}
 
-		// Backup current registered shortcodes and clear them all out
-		$orig_shortcode_tags = $shortcode_tags;
+		// Backup current registered shortcodes and clear them all out (we do not backup our own, because we will add and parse them below)
+		$orig_shortcode_tags = array_diff_key( $shortcode_tags, array_flip( $this->shortcodes ) );
 		remove_all_shortcodes();
 
 		// Register all of this plugin's shortcodes

Original file line number	Diff line number	Diff line change
`@@ -659,8 +659,8 @@ function shortcode_hack( $content, $callback, $ignore_html = true ) {`
`659`	`659`	`return $content;`
`660`	`660`	`}`
`661`	`661`
`662`		`- // Backup current registered shortcodes and clear them all out`
`663`		`- $orig_shortcode_tags = $shortcode_tags;`
	`662`	`+ // Backup current registered shortcodes and clear them all out (we do not backup our own, because we will add and parse them below)`
	`663`	`+ $orig_shortcode_tags = array_diff_key( $shortcode_tags, array_flip( $this->shortcodes ) );`
`664`	`664`	`remove_all_shortcodes();`
`665`	`665`
`666`	`666`	`// Register all of this plugin's shortcodes`