Merge pull request #261 from Automattic/fix/32-nested-shorcode-problem

Author: fjorgemota

syntaxhighlighter.php

@@ -617,6 +617,24 @@ function output_shortcodes_for_tinymce() {
 	}
 
 
+	/**
+	 * Returns all shortcodes not handled by SyntaxHighlighter unchanged, so they
+	 * can be processed by their original handlers after SyntaxHighlighter has
+	 * run.
+	 * 
+	 * @param mixed $output The shortcode's returned value (false by default).
+	 * @param string $tag The name of the shortcode.
+	 * @param array|null $attr The shortcode attributes.
+	 * @param array $m Regular expression match array.
+	 * @return string|false Return the matched shortcode as-is for all shortcodes not handled by SyntaxHighlighter, returns $output otherwise.
+	 */
+	function pre_do_shortcode_shortcode_hack_skip_others( $output, $tag, $attr, $m ) {
+		if ( ! in_array( $tag, $this->shortcodes, true ) ) {
+			return $m[0];
+		}
+		return $output;
+	}
+
 	/**
 	 * Process only this plugin's shortcodes.
 	 *
@@ -628,7 +646,11 @@ function output_shortcodes_for_tinymce() {
 	 *
 	 * First we need to clear out all existing shortcodes, then register
 	 * just this plugin's ones, process them, and then restore the original
-	 * list of shortcodes.
+	 * list of shortcodes. Additionally, we have to add another hack to other
+	 * shortcodes, such as [gallery], to return the entire shortcode string as
+	 * it appears in the original content to allow SyntaxHighlighter's shortcode
+	 * strings (e.g., [c]) be used within other shortcodes without interference
+	 * from SyntaxHighlighter.
 	 *
 	 * To make matters more complicated, if someone has done [[code]foo[/code]]
 	 * in order to display the shortcode (not render it), then do_shortcode()
@@ -639,10 +661,6 @@ function output_shortcodes_for_tinymce() {
 	 * even more brackets escaped shortcodes in order to result in
 	 * the shortcodes actually being displayed instead rendered.
 	 *
-	 * We only need to do this for this plugin's shortcodes however
-	 * as all other shortcodes such as [[gallery]] will be untouched
-	 * by this pass of do_shortcode.
-	 *
 	 * Phew!
 	 *
 	 * @param string $content     The post content.
@@ -659,16 +677,22 @@ 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
 		foreach ( $this->shortcodes as $shortcode ) {
 			add_shortcode( $shortcode, $callback );
 		}
 
-		$regex = '/' . get_shortcode_regex( $this->shortcodes ) . '/';
+		// Register all other shortcodes, ensuring their content remains unchanged using yet another hack.
+		foreach ( $orig_shortcode_tags as $shortcode_tagname => $shortcode ) {
+			add_shortcode( $shortcode_tagname, '__return_empty_string' );
+		}
+		add_filter( 'pre_do_shortcode_tag', array( $this, 'pre_do_shortcode_shortcode_hack_skip_others' ), 10, 4 );
+
+		$regex = '/' . get_shortcode_regex() . '/';
 
 		// Parse the shortcodes (only this plugins's are registered)
 		if ( $ignore_html ) {
@@ -692,8 +716,9 @@ function shortcode_hack( $content, $callback, $ignore_html = true ) {
 			);
 		}
 
-		// Put the original shortcodes back
+		// Put the original shortcodes back, and remove the hacky pre_do_shortcode_tag filter
 		$shortcode_tags = $orig_shortcode_tags;
+		remove_filter('pre_do_shortcode_tag', array($this, 'pre_do_shortcode_shortcode_hack_skip_others'), 10);
 
 		return $content;
 	}
@@ -749,7 +774,6 @@ function shortcode_hack_extra_escape_escaped_shortcodes_and_parse( $match ) {
 		return do_shortcode_tag( $match );
 	}
 
-
 	// The main filter for the post contents. The regular shortcode filter can't be used as it's post-wpautop().
 	function parse_shortcodes( $content ) {
 		return $this->shortcode_hack( $content, array( $this, 'shortcode_callback' ) );
@@ -1377,7 +1401,7 @@ function shortcode_callback( $atts, $code = '', $tag = false ) {
 		$code = ( false === strpos( $code, '<' ) && false === strpos( $code, '>' ) && 2 == $this->get_code_format( $post ) ) ? strip_tags( $code ) : htmlspecialchars( $code );
 
 		// Escape shortcodes
-		$code = preg_replace( '/\[/', '&#91;', $code );
+		$code = preg_replace( '/\[/', '&#x5B;', $code );
 
 		$params[] = 'notranslate'; // For Google, see http://otto42.com/9k