Changeset 24241

Timestamp:

05/10/2013 10:54:33 PM (11 years ago)

Author:

markjaquith

Message:

Improve regular expressions by using a backreference to match right quote of quote pair when matching attributes.

props kovshenin. see #24225.

Location:

trunk/wp-includes

Files:

• formatting.php (modified) (1 diff)
• media.php (modified) (3 diffs)
• post-formats.php (modified) (1 diff)

trunk/wp-includes/formatting.php

@@ -3207 +3207 @@
     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 ) . '">';
 }

trunk/wp-includes/media.php

@@ -1930 +1930 @@
 
     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 ) );
@@ -2255 +2255 @@
 
     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;
@@ -2311 +2311 @@
                     $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];
                     }
 

trunk/wp-includes/post-formats.php

@@ -792 +792 @@
         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] );
     }