Ticket #58372: 58372.diff

src/wp-admin/export.php

@@ -141 +141 @@
 
         $months = $wpdb->get_results(
                 $wpdb->prepare(
-                        "
-                SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
-                FROM $wpdb->posts
-                WHERE post_type = %s AND post_status != 'auto-draft'
-                ORDER BY post_date DESC
-                        ",
+                        "SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
+                        FROM $wpdb->posts
+                        WHERE post_type = %s AND post_status != 'auto-draft'
+                        ORDER BY post_date DESC",
                         $post_type
                 )
         );

src/wp-includes/deprecated.php

@@ -4562 +4562 @@
                 $post_type           = esc_sql( $post_type );
                 $post_type_in_string = "'" . implode( "','", $post_type ) . "'";
                 $sql                 = $wpdb->prepare(
-                        "
-                        SELECT ID
+                        "SELECT ID
                         FROM $wpdb->posts
                         WHERE post_title = %s
-                        AND post_type IN ($post_type_in_string)
-                ",
+                        AND post_type IN ($post_type_in_string)",
                         $page_title
                 );
         } else {
-                $sql = $wpdb->prepare(
-                        "
+                $sql = $wpdb->prepare("
                         SELECT ID
                         FROM $wpdb->posts
                         WHERE post_title = %s
-                        AND post_type = %s
-                ",
+                        AND post_type = %s",
                         $page_title,
                         $post_type
                 );

src/wp-includes/media.php

@@ -4543 +4543 @@
         if ( ! is_array( $months ) ) {
                 $months = $wpdb->get_results(
                         $wpdb->prepare(
-                                "
-                        SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
-                        FROM $wpdb->posts
-                        WHERE post_type = %s
-                        ORDER BY post_date DESC
-                ",
+                                "SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
+                                FROM $wpdb->posts
+                                WHERE post_type = %s
+                                ORDER BY post_date DESC",
                                 'attachment'
                         )
                 );

src/wp-includes/user.php

@@ -1268 +1268 @@
 
                 // Add the meta_value index to the selection list, then run the query.
                 $row = $wpdb->get_row(
-                        "
-                        SELECT {$select_count}, COUNT(*)
+                        "SELECT {$select_count}, COUNT(*)
                         FROM {$wpdb->usermeta}
                         INNER JOIN {$wpdb->users} ON user_id = ID
-                        WHERE meta_key = '{$blog_prefix}capabilities'
-                ",
+                        WHERE meta_key = '{$blog_prefix}capabilities'",
                         ARRAY_N
                 );
 
@@ -3545 +3543 @@
         $regex = preg_replace( '/[^a-zA-Z_\|-]/', '', $regex );
         $users = $wpdb->get_col(
                 $wpdb->prepare(
-                        "
-                SELECT user_id
-                FROM $wpdb->usermeta
-                WHERE meta_key = '{$prefix}capabilities'
-                AND meta_value NOT REGEXP %s
-        ",
+                        "SELECT user_id
+                        FROM $wpdb->usermeta
+                        WHERE meta_key = '{$prefix}capabilities'
+                        AND meta_value NOT REGEXP %s",
                         $regex
                 )
         );