Changeset 1353216 for syntaxhighlighter

Timestamp:

02/18/2016 08:32:17 AM (10 years ago)

Author:

Viper007Bond

Message:

v3.2.1

​https://github.com/Viper007Bond/syntaxhighlighter/releases/tag/v3.2.1

Location:

syntaxhighlighter/trunk

Files:

• . (modified) (1 prop)
• readme.md (deleted)
• readme.txt (modified) (1 diff)
• syntaxhighlighter.php (modified) (7 diffs)

syntaxhighlighter/trunk

@@ -1 +1 @@
 .git
+.gitignore
 .idea
-.gitignore
+readme.md

@@ -1 +1 @@
 .git
+.gitignore
 .idea
-.gitignore
+readme.md

syntaxhighlighter/trunk/readme.txt

@@ -55 +55 @@
 
 == ChangeLog ==
+
+= Version 3.2.1 =
+
+* Fix shortcode issues that would occur during post editing if the code contained what looked like opening HTML tags such as `<?php`. See [this forum thread](https://wordpress.org/support/topic/php-opening-closing-tags-break-code-blocks) for details.
 
 = Version 3.2.0 =

syntaxhighlighter/trunk/syntaxhighlighter.php

@@ -5 +5 @@
 Plugin Name:  SyntaxHighlighter Evolved
 Plugin URI:   http://www.viper007bond.com/wordpress-plugins/syntaxhighlighter/
-Version:      3.2.0
+Version:      3.2.1
 Description:  Easily post syntax-highlighted code to your site without having to modify the code at all. Uses Alex Gorbatchev's <a href="http://alexgorbatchev.com/wiki/SyntaxHighlighter">SyntaxHighlighter</a>. <strong>TIP:</strong> Don't use the Visual editor if you don't want your code mangled. TinyMCE will "clean up" your HTML.
 Author:       Alex Mills (Viper007Bond)
@@ -22 +22 @@
 class SyntaxHighlighter {
     // All of these variables are private. Filters are provided for things that can be modified.
-    var $pluginver            = '3.2.0';  // Plugin version
+    var $pluginver            = '3.2.1';  // Plugin version
     var $agshver              = false;    // Alex Gorbatchev's SyntaxHighlighter version (dynamically set below due to v2 vs v3)
     var $shfolder             = false;    // Controls what subfolder to load SyntaxHighlighter from (v2 or v3)
@@ -349 +349 @@
      * Phew!
      *
-     * @param string $content  The post content.
-     * @param string $callback The callback function that should be used for add_shortcode()
+     * @param string $content     The post content.
+     * @param string $callback    The callback function that should be used for add_shortcode()
+     * @param bool   $ignore_html When true, shortcodes inside HTML elements will be skipped.
      *
      * @return string The filtered content, with this plugin's shortcodes parsed.
      */
-    function shortcode_hack( $content, $callback ) {
+    function shortcode_hack( $content, $callback, $ignore_html = true ) {
         global $shortcode_tags;
 
@@ -371 +372 @@
         }
 
-        // Extra escape escaped shortcodes because do_shortcode() is going to strip a pair of square brackets when it runs
-        $content = preg_replace_callback(
-            '/' . get_shortcode_regex( $this->shortcodes ) . '/',
-            array( $this, 'shortcode_hack_extra_escape_escaped_shortcodes' ),
-            $content
-        );
-
-        // Do the shortcodes (only this plugins's are registered)
-        $content = do_shortcode( $content, true );
+        $regex = '/' . get_shortcode_regex( $this->shortcodes ) . '/';
+
+        // Parse the shortcodes (only this plugins's are registered)
+        if ( $ignore_html ) {
+            // Extra escape escaped shortcodes because do_shortcode_tag() called by do_shortcode() is going to strip a pair of square brackets when it runs
+            $content = preg_replace_callback(
+                $regex,
+                array( $this, 'shortcode_hack_extra_escape_escaped_shortcodes' ),
+                $content
+            );
+
+            // Normal, safe parsing
+            $content = do_shortcode( $content, true );
+        } else {
+            // Extra escape escaped shortcodes because do_shortcode_tag() called by do_shortcode() is going to strip a pair of square brackets when it runs.
+            // Then call do_shortcode_tag(). This is basically do_shortcode() without calling do_shortcodes_in_html_tags() which breaks things.
+            // For context, see https://wordpress.org/support/topic/php-opening-closing-tags-break-code-blocks
+            $content = preg_replace_callback(
+                $regex,
+                array( $this, 'shortcode_hack_extra_escape_escaped_shortcodes_and_parse' ),
+                $content
+            );
+        }
 
         // Put the original shortcodes back
@@ -424 +439 @@
     }
 
+    /**
+     * This is a combination of this class's shortcode_hack_extra_escape_escaped_shortcodes()
+     * and do_shortcode_tag() for performance reasons so that we don't have to run some regex twice.
+     *
+     * @param array $match Regular expression match array.
+     *
+     * @return string|false False on failure, otherwise a parse shortcode tag.
+     */
+    function shortcode_hack_extra_escape_escaped_shortcodes_and_parse( $match ) {
+        $match[0] = $this->shortcode_hack_extra_escape_escaped_shortcodes( $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().
@@ -433 +462 @@
     // HTML entity encode the contents of shortcodes
     function encode_shortcode_contents( $content ) {
-        return $this->shortcode_hack( $content, array( $this, 'encode_shortcode_contents_callback' ) );
+        return $this->shortcode_hack( $content, array( $this, 'encode_shortcode_contents_callback' ), false );
     }
 
@@ -466 +495 @@
     // HTML entity decode the contents of shortcodes
     function decode_shortcode_contents( $content ) {
-        return $this->shortcode_hack( $content, array( $this, 'decode_shortcode_contents_callback' ) );
+        return $this->shortcode_hack( $content, array( $this, 'decode_shortcode_contents_callback' ), false );
     }
 

@@ -1 +1 @@
 .git
+.gitignore
 .idea
-.gitignore
+readme.md