Ticket #24222: 24222.diff

wp-includes/ms-functions.php

@@ -460 +460 @@
                 $errors->add( 'user_name', __( 'Sorry, usernames may not contain the character “_”!' ) );
 
         // all numeric?
-        $match = array();
         preg_match( '/[0-9]*/', $user_name, $match );
         if ( $match[0] == $user_name )
                 $errors->add('user_name', __('Sorry, usernames must have letters too!'));
@@ -572 +571 @@
                 $errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
 
         // all numeric?
-        $match = array();
         preg_match( '/[0-9]*/', $blogname, $match );
         if ( $match[0] == $blogname )
                 $errors->add('blogname', __('Sorry, site names must have letters too!'));

wp-includes/shortcodes.php

@@ -152 +152 @@
  */
 function has_shortcode( $content, $tag ) {
         if ( shortcode_exists( $tag ) ) {
-                $matches = array();
                 preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
                 if ( empty( $matches ) )
                         return false;

wp-includes/post-template.php

@@ -185 +185 @@
 
         $output = '';
         $has_teaser = false;
-        $matches = array();
 
         // If post password required and it doesn't match the cookie.
         if ( post_password_required() )

wp-includes/media.php

@@ -1908 +1908 @@
  */
 function get_content_media( $type, &$content, $html = true, $remove = false, $limit = 0 ) {
         $items = array();
-        $matches = array();
 
         if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER ) && ! empty( $matches ) ) {
                 foreach ( $matches as $shortcode ) {
@@ -1927 +1926 @@
         if ( $html )
                 return $items;
 
-        $src = '';
         $data = array();
 
         foreach ( $items as $item ) {
@@ -1958 +1956 @@
  */
 function get_embedded_media( $type, &$content, $remove = false, $limit = 0 ) {
         $html = array();
-        $matches = '';
 
         foreach ( array( $type, 'object', 'embed', 'iframe' ) as $tag ) {
                 if ( preg_match( '#' . get_tag_regex( $tag ) . '#', $content, $matches ) ) {
@@ -2206 +2203 @@
  * @return array The found images or srcs
  */
 function get_content_images( &$content, $html = true, $remove = false, $limit = 0 ) {
-        $matches = array();
         $tags = array();
         $captions = array();
 
@@ -2255 +2251 @@
         if ( $html )
                 return $tags;
 
-        $src = '';
         $srcs = array();
 
         foreach ( $tags as $tag ) {
@@ -2300 +2295 @@
  * @return array A list of galleries, which in turn are a list of their srcs in order
  */
 function get_content_galleries( &$content, $html = true, $remove = false, $limit = 0 ) {
-        $src = '';
         $galleries = array();
-        $matches = array();
 
         if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER ) && ! empty( $matches ) ) {
                 foreach ( $matches as $shortcode ) {
@@ -2493 +2486 @@
                 $urls[] = get_attachment_link( $media->ID );
 
                 $count = 1;
-                $matches = array();
                 $content = $post->post_content;
 
                 if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER ) && ! empty( $matches ) ) {

wp-includes/post-formats.php

@@ -580 +580 @@
                                 continue;
                 }
 
-                $matches = array();
                 $matched = preg_match( $newline_regex, $line, $matches );
                 if ( ! $matched )
                         continue;
@@ -709 +708 @@
         if ( empty( $content ) )
                 return '';
 
-        $matches = array();
         if ( ! preg_match( '/<blockquote[^>]*>(.+?)<\/blockquote>/is', $content, $matches ) ) {
                 $quote = $content;
                 if ( $remove || ! empty( $replace ) )
@@ -783 +781 @@
         if ( empty( $content ) )
                 return '';
 
-        $matches = array();
-
         // the content is a URL
         $trimmed = trim( $content );
         if ( 0 === stripos( $trimmed, 'http' ) && ! preg_match( '#\s#', $trimmed ) ) {
@@ -883 +879 @@
 
         $output = '';
         $has_teaser = false;
-        $matches = array();
 
         // If post password required and it doesn't match the cookie.
         if ( post_password_required() )

wp-includes/formatting.php

@@ -3264 +3264 @@
                 $filtered = trim( preg_replace('/[\r\n\t ]+/', ' ', $filtered) );
         }
 
-        $match = array();
         $found = false;
         while ( preg_match('/%[a-f0-9]{2}/i', $filtered, $match) ) {
                 $filtered = str_replace($match[0], '', $filtered);