Changeset 11245

Timestamp:

09/21/2021 12:22:16 AM (5 years ago)

Author:

dd32

Message:

Trac: GitHub: When importing code blocks from GitHub, import the code blocks properly. Take two.

See #5855.

File:

• sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php (modified) (1 diff)

sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php

@@ -330 +330 @@
         // Convert Code blocks.
         $desc = preg_replace_callback(
-                '#```(?P<format>[a-z]+$)?(?P<code>.+?)```#sm',
+                '#^(?P<indent>[ >]*)```(?P<format>[a-z]+$)(?P<code>.+?)```$#sm',
                 function( $m ) {
                         return
-                                "{{{\n" .
-                                ( $m['format'] ? "#!" . trim( $m['format'] ) . "\n" : '' ) .
+                                $m['indent'] . "{{{\n" .
+                                $m['indent'] . "#!" . trim( $m['format'] ) . "\n" .
                                 trim( $m['code'] ) . "\n" .
-                                "}}}\n";
+                                $m['indent'] . "}}}\n";
                 },
                 $desc
         );
 
+        $desc = preg_replace( '#```(.+?)```#s', '{{{$1}}}', $desc );
+
         // Convert Images (Must happen prior to Links, as the only difference is a preceeding !)
         $desc = preg_replace( '#!\[(.+?)\]\(https?://(.+?)\)#', '[[Image(https://i0.wp.com/$2)]]', $desc );