Changeset 12504

Timestamp:

03/28/2023 05:38:32 AM (3 years ago)

Author:

dd32

Message:

Markdown Importers: Jetpack's jetpack_require_lib() helper method no longer exists. Use direct file references.

See #6411.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins

Files:

• wporg-cli/inc/class-markdown-import.php (modified) (2 diffs)
• wporg-markdown/inc/class-importer.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-cli/inc/class-markdown-import.php

@@ -228 +228 @@
             return $markdown_source;
         }
-        if ( ! function_exists( 'jetpack_require_lib' ) ) {
-            return new WP_Error( 'missing-jetpack-require-lib', 'jetpack_require_lib() is missing on system.' );
+
+        if ( ! class_exists( 'WPCom_GHF_Markdown_Parser' ) && defined( 'JETPACK__PLUGIN_DIR' ) ) {
+            include JETPACK__PLUGIN_DIR . '/_inc/lib/markdown.php';
+        }
+        if ( ! class_exists( 'WPCom_GHF_Markdown_Parser' ) ) {
+            return new WP_Error( 'missing-jetpack-markdown', 'Jetpack Markdown is missing on system.' );
         }
 
@@ -253 +257 @@
 
         // Transform to HTML and save the post
-        jetpack_require_lib( 'markdown' );
         $parser = new \WPCom_GHF_Markdown_Parser;
         $html = $parser->transform( $markdown );

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-markdown/inc/class-importer.php

@@ -420 +420 @@
             return $markdown_source;
         }
-        if ( ! function_exists( 'jetpack_require_lib' ) ) {
-            return new WP_Error( 'missing-jetpack-require-lib', 'jetpack_require_lib() is missing on system.' );
+
+        if ( ! class_exists( 'WPCom_GHF_Markdown_Parser' ) && defined( 'JETPACK__PLUGIN_DIR' ) ) {
+            include JETPACK__PLUGIN_DIR . '/_inc/lib/markdown.php';
+        }
+        if ( ! class_exists( 'WPCom_GHF_Markdown_Parser' ) ) {
+            return new WP_Error( 'missing-jetpack-markdown', 'Jetpack Markdown is missing on system.' );
         }
 
@@ -479 +483 @@
 
         // Transform to HTML and save the post
-        jetpack_require_lib( 'markdown' );
         $parser = new WPCom_GHF_Markdown_Parser();
         $parser->preserve_shortcodes = false;