Changeset 10316

Timestamp:

09/29/2020 06:46:43 AM (5 years ago)

Author:

dd32

Message:

Plugin Directory: When splitting the post content into sections, trim any leading newlines off the content to prevent the section -> content pairs being off.

This prevents a PHP Notice when the resulting array was previously [ '', 'description', 'content here..', .. instead of [ 'description', '..

Location:

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

Files:

• api/routes/class-plugin.php (modified) (1 diff)
• class-plugin-directory.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin.php

@@ -139 +139 @@
         $result['sections']                 = array();
 
-        $_pages = preg_split( '#<!--section=(.+?)-->#', $post->post_content, - 1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
+        $_pages = preg_split( '#<!--section=(.+?)-->#', ltrim( $post->post_content ), - 1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
         for ( $i = 0; $i < count( $_pages ); $i += 2 ) {
             $result['sections'][ $_pages[ $i ] ] = apply_filters( 'the_content', $_pages[ $i + 1 ] ?? '', $_pages[ $i ] );

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php

@@ -1518 +1518 @@
      */
     public function split_post_content_into_pages( $content ) {
-        $_pages        = preg_split( '#<!--section=(.+?)-->#', $content, - 1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
+        $_pages        = preg_split( '#<!--section=(.+?)-->#', ltrim( $content ), - 1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
         $content_pages = array(
             'screenshots' => '[wporg-plugins-screenshots]',
@@ -1529 +1529 @@
             // Don't overwrite existing tabs.
             if ( ! isset( $content_pages[ $_pages[ $i ] ] ) ) {
-                $content_pages[ $_pages[ $i ] ] = $_pages[ $i + 1 ];
+                $content_pages[ $_pages[ $i ] ] = $_pages[ $i + 1 ] ?? '';
             }
         }