Changeset 1998464

Timestamp:

12/20/2018 01:58:12 AM (6 years ago)

Author:

Viper007Bond

Message:

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

Location:

syntaxhighlighter/trunk

Files:

• . (modified) (1 prop)
• readme.txt (modified) (1 diff)
• syntaxhighlighter.php (modified) (5 diffs)

syntaxhighlighter/trunk

@@ -13 +13 @@
 assets
 src
+
+
+
+

@@ -13 +13 @@
 assets
 src
+
+
+
+

syntaxhighlighter/trunk/readme.txt

@@ -37 +37 @@
 
 == ChangeLog ==
+
+
+
+
 
 = Version 3.4.1 =

syntaxhighlighter/trunk/syntaxhighlighter.php

@@ -5 +5 @@
 Plugin Name:  SyntaxHighlighter Evolved
 Plugin URI:   http://www.viper007bond.com/wordpress-plugins/syntaxhighlighter/
-Version:      3.4.1
+Version:      3.4.
 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.4.1';  // Plugin version
+    var $pluginver            = '3.4.';  // 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)
@@ -345 +345 @@
      * For the shortcode, brushes are activated by `shortcode_callback()`, but that won't detect brushes that were
      * used in blocks. For that, we need to extract the data from the block's attributes.
+
+
+
+
+
+
      */
     function enable_brushes_used_in_blocks( $content ) {
@@ -356 +362 @@
 
         // Lower overhead than a full parse.
-        if ( ! has_block( 'syntaxhighlighter/code', $content ) ) {
-            return $content;
+        if (
+            ! has_block( 'syntaxhighlighter/code', $content )
+            && ! has_block( 'core/block', $content ) // Reusable
+        ) {
+            //return $content;
         }
 
@@ -369 +378 @@
 
         foreach ( $blocks as $block ) {
-            if ( empty( $block['blockName'] ) || 'syntaxhighlighter/code' !== $block['blockName'] ) {
+            if ( empty( $block['blockName'] ) ) {
                 continue;
             }
 
-            $language = ( ! empty( $block['attrs']['language'] ) ) ? $block['attrs']['language'] : 'plain';
-
-            if ( in_array( $language, $this->brushes, true ) ) {
-                $this->usedbrushes[ $this->brushes[ $language ] ] = true;
+            switch ( $block['blockName'] ) {
+                // Normal block usage
+                case 'syntaxhighlighter/code':
+                    $language = ( ! empty( $block['attrs']['language'] ) ) ? $block['attrs']['language'] : 'plain';
+
+                    if ( in_array( $language, $this->brushes, true ) ) {
+                        $this->usedbrushes[ $this->brushes[ $language ] ] = true;
+                    }
+
+                    break;
+
+                // But the block could also be used inside of a reusable block
+                case 'core/block':
+                    /**
+                     * Rather than going down the block parsing rabbit hole of dynamic blocks,
+                     * let's just hook in post-render and look for our HTML.
+                     */
+                    add_filter( 'the_content', array( $this, 'enable_brushes_via_raw_html_parsing' ), 10 );
+
+                    break;
+            }
+        }
+
+        return $content;
+    }
+
+    /**
+     * Parses raw HTML looking for SyntaxHighlighter's <pre> tags and queues brushes
+     * for the languages used.
+     *
+     * This filter only runs when a reusable block is used in a post.
+     * It was easier to implement than loading the block, which then could
+     * have child blocks and so forth. Technically this means that we're
+     * parsing any regular SyntaxHighlighter blocks again, but oh well. :)
+     *
+     * @since 3.4.2
+     *
+    * @param string $content The post content.
+     *
+     * @return string Unmodified $content.
+     */
+    public function enable_brushes_via_raw_html_parsing( $content ) {
+        if ( false === strpos( $content,'<pre class="wp-block-syntaxhighlighter-code' ) ) {
+            return $content;
+        }
+
+        preg_match_all(
+            '/<pre class="wp-block-syntaxhighlighter-code brush: ([^;]+);/',
+            $content,
+            $languages,
+            PREG_PATTERN_ORDER
+        );
+
+        if ( is_array( $languages ) ) {
+            foreach ( $languages[1] as $language ) {
+                if ( in_array( $language, $this->brushes, true ) ) {
+                    $this->usedbrushes[ $this->brushes[ $language ] ] = true;
+                }
             }
         }

@@ -13 +13 @@
 assets
 src
+
+
+
+