Ticket #24225: 24225.2.diff

wp-admin/includes/media.php

@@ -150 +150 @@
         // convert any remaining line breaks to <br>
         $caption = preg_replace( '/[ \n\t]*\n[ \t]*/', '<br />', $caption );
 
-        $html = preg_replace( '/(class=["\'][^\'"]*)align(none|left|right|center)\s?/', '$1', $html );
+        $html = preg_replace( '/(class=(["\'])[^\\2]*)align(none|left|right|center)\s?/', '$1', $html );
         if ( empty($align) )
                 $align = 'none';
 

wp-includes/media.php

@@ -1929 +1929 @@
         $data = array();
 
         foreach ( $items as $item ) {
-                preg_match_all( '#src=[\'"](.+?)[\'"]#is', $item, $src, PREG_SET_ORDER );
+                preg_match_all( '#src=([\'"])(.+?)\\1#is', $item, $src, PREG_SET_ORDER );
                 if ( ! empty( $src ) ) {
                         $srcs = array();
                         foreach ( $src as $s )
-                                $srcs[] = $s[1];
+                                $srcs[] = $s[2];
 
                         $data[] = array_values( array_unique( $srcs ) );
                 }
@@ -2254 +2254 @@
         $srcs = array();
 
         foreach ( $tags as $tag ) {
-                preg_match( '#src=[\'"](.+?)[\'"]#is', $tag, $src );
-                if ( ! empty( $src[1] ) ) {
-                        $srcs[] = $src[1];
+                preg_match( '#src=([\'"])(.+?)\\1#is', $tag, $src );
+                if ( ! empty( $src[2] ) ) {
+                        $srcs[] = $src[2];
                         if ( $limit > 0 && count( $srcs ) >= $limit )
                                 break;
                 }
@@ -2310 +2310 @@
                                 if ( $html ) {
                                         $galleries[] = $gallery;
                                 } else {
-                                        preg_match_all( '#src=[\'"](.+?)[\'"]#is', $gallery, $src, PREG_SET_ORDER );
+                                        preg_match_all( '#src=([\'"])(.+?)\\1#is', $gallery, $src, PREG_SET_ORDER );
                                         if ( ! empty( $src ) ) {
                                                 foreach ( $src as $s )
-                                                        $srcs[] = $s[1];
+                                                        $srcs[] = $s[2];
                                         }
 
                                         $data['src'] = array_values( array_unique( $srcs ) );

wp-includes/post-formats.php

@@ -789 +789 @@
 
                 return $trimmed;
         // the content is HTML so we grab the first href
-        } elseif ( preg_match( '/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', $content, $matches ) ) {
-                return esc_url_raw( $matches[1] );
+        } elseif ( preg_match( '/<a\s[^>]*?href=([\'"])(.+?)\\1/is', $content, $matches ) ) {
+                return esc_url_raw( $matches[2] );
         }
 
         $lines = explode( "\n", $trimmed );

wp-includes/formatting.php

@@ -3201 +3201 @@
 function _links_add_target( $m ) {
         global $_links_add_target;
         $tag = $m[1];
-        $link = preg_replace('|(target=[\'"](.*?)[\'"])|i', '', $m[2]);
+        $link = preg_replace('|(target=([\'"])(.*?)\\2)|i', '', $m[2]);
         return '<' . $tag . $link . ' target="' . esc_attr( $_links_add_target ) . '">';
 }