Changeset 24241 for trunk/wp-includes/media.php

Timestamp:

05/10/2013 10:54:33 PM (12 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.

File:

• trunk/wp-includes/media.php (modified) (3 diffs)

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];
                     }