Changes from tags/2.6.1 at r8849 to tags/2.6.2 at r8849

Location:

tags/2.6.2

Files:

• wp-admin/css/press-this-ie.css (modified) (1 diff, 1 prop)
• wp-admin/import/textpattern.php (modified) (1 diff)
• wp-admin/includes/image.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (1 diff)
• wp-includes/pluggable.php (modified) (1 diff)
• wp-includes/post.php (modified) (3 diffs)
• wp-includes/query.php (modified) (8 diffs)
• wp-includes/version.php (modified) (1 diff)
• wp-includes/widgets.php (modified) (1 diff)
• wp-login.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

tags/2.6.2/wp-admin/css/press-this-ie.css

@@ -1 @@
-
 #posting {
     position: static !important;

tags/2.6.2/wp-admin/import/textpattern.php

@@ -334 +334 @@
                 $category1 = $category1->term_id;
                 $category2 = get_category_by_slug($Category2);
-                $category2 = $category1->term_id;
+                $category2 = $category2->term_id;
                 if($cat1 = $category1) { $cats[1] = $cat1; }
                 if($cat2 = $category2) { $cats[2] = $cat2; }

tags/2.6.2/wp-admin/includes/image.php

@@ -220 +220 @@
             $iptc = iptcparse($info['APP13']);
             if ( !empty($iptc['2#110'][0]) ) // credit
-                $meta['credit'] = trim( $iptc['2#110'][0] );
+                $meta['credit'] = utf8_encode(trim($iptc['2#110'][0]));
             elseif ( !empty($iptc['2#080'][0]) ) // byline
-                $meta['credit'] = trim( $iptc['2#080'][0] );
+                $meta['credit'] = utf8_encode(trim($iptc['2#080'][0]));
             if ( !empty($iptc['2#055'][0]) and !empty($iptc['2#060'][0]) ) // created datee and time
                 $meta['created_timestamp'] = strtotime($iptc['2#055'][0] . ' ' . $iptc['2#060'][0]);
             if ( !empty($iptc['2#120'][0]) ) // caption
-                $meta['caption'] = trim( $iptc['2#120'][0] );
+                $meta['caption'] = utf8_encode(trim($iptc['2#120'][0]));
             if ( !empty($iptc['2#116'][0]) ) // copyright
-                $meta['copyright'] = trim( $iptc['2#116'][0] );
+                $meta['copyright'] = utf8_encode(trim($iptc['2#116'][0]));
             if ( !empty($iptc['2#005'][0]) ) // title
-                $meta['title'] = trim( $iptc['2#005'][0] );
+                $meta['title'] = utf8_encode(trim($iptc['2#005'][0]));
          }
     }

tags/2.6.2/wp-admin/includes/template.php

@@ -716 +716 @@
             ORDER BY comment_date_gmt DESC LIMIT $start, $num");
     } else {
-        $comments = $wpdb->get_results( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments USE INDEX (comment_date_gmt) WHERE $approved ORDER BY comment_date_gmt DESC LIMIT $start, $num" );
+        $comments = $wpdb->get_results( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments WHERE $approved ORDER BY comment_date_gmt DESC LIMIT $start, $num" );
     }
 

tags/2.6.2/wp-includes/formatting.php

@@ -332 +332 @@
     if ( $strict )
         $username = preg_replace('|[^a-z0-9 _.\-@]|i', '', $username);
+
+    // Consolidate contiguous whitespace
+    $username = preg_replace('|\s+|', ' ', $username);
 
     return apply_filters('sanitize_user', $username, $raw_username, $strict);

tags/2.6.2/wp-includes/pluggable.php

@@ -1290 +1290 @@
     $password = '';
     for ( $i = 0; $i < $length; $i++ )
-        $password .= substr($chars, mt_rand(0, strlen($chars) - 1), 1);
+        $password .= substr($chars, wp_rand(0, strlen($chars) - 1), 1);
     return $password;
+}
+endif;
+
+if ( !function_exists('wp_rand') ) :
+ /**
+ * Generates a random number
+ *
+ * @since 2.6.2
+ *
+ * @param int $min Lower limit for the generated number (optional, default is 0)
+ * @param int $max Upper limit for the generated number (optional, default is 4294967295)
+ * @return int A random number between min and max
+ */
+function wp_rand( $min = 0, $max = 0 ) {
+    global $rnd_value;
+
+    $seed = get_option('random_seed');
+
+    // Reset $rnd_value after 14 uses
+    // 32(md5) + 40(sha1) + 40(sha1) / 8 = 14 random numbers from $rnd_value
+    if ( strlen($rnd_value) < 8 ) {
+        $rnd_value = md5( uniqid(microtime() . mt_rand(), true ) . $seed );
+        $rnd_value .= sha1($rnd_value);
+        $rnd_value .= sha1($rnd_value . $seed);
+        $seed = md5($seed . $rnd_value);
+        update_option('random_seed', $seed);
+    }
+
+    // Take the first 8 digits for our value
+    $value = substr($rnd_value, 0, 8);
+
+    // Strip the first eight, leaving the remainder for the next call to wp_rand().
+    $rnd_value = substr($rnd_value, 8);
+
+    $value = abs(hexdec($value));
+
+    // Reduce the value to be within the min - max range
+    // 4294967295 = 0xffffffff = max random number
+    if ( $max != 0 )
+        $value = $min + (($max - $min + 1) * ($value / (4294967295 + 1)));
+
+    return abs(intval($value)); 
 }
 endif;

tags/2.6.2/wp-includes/post.php

@@ -466 +466 @@
         'exclude' => '', 'meta_key' => '',
         'meta_value' =>'', 'post_type' => 'post',
-        'post_parent' => 0
+        'post_parent' => 0, 'suppress_filters' => true
     );
 
@@ -595 +595 @@
     $meta_cache = wp_cache_get($post_id, 'post_meta');
 
+    if ( !$meta_cache ) {
+        update_postmeta_cache($post_id);
+        $meta_cache = wp_cache_get($post_id, 'post_meta');
+    }
+
     if ( isset($meta_cache[$key]) ) {
         if ( $single ) {
             return maybe_unserialize( $meta_cache[$key][0] );
         } else {
-            return maybe_unserialize( $meta_cache[$key] );
-        }
-    }
-
-    if ( !$meta_cache ) {
-        update_postmeta_cache($post_id);
-        $meta_cache = wp_cache_get($post_id, 'post_meta');
-    }
-
-    if ( $single ) {
-        if ( isset($meta_cache[$key][0]) )
-            return maybe_unserialize($meta_cache[$key][0]);
-        else
-            return '';
-    } else {
-        return maybe_unserialize($meta_cache[$key]);
-    }
+            return array_map('maybe_unserialize', $meta_cache[$key]);
+        }
+    }
+
+    return '';
 }
 
@@ -3298 +3291 @@
         return;
 
-    if ( isset($post['post_type']) && 'revision' == $post_post['type'] )
+    if ( isset($post['post_type']) && 'revision' == $post['post_type'] )
         return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
 

tags/2.6.2/wp-includes/query.php

@@ -776 +776 @@
             $qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
 
-        if ( $this->is_posts_page && !$qv['withcomments'] )
+        if ( $this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments'] ) )
             $this->is_comment_feed = false;
 
@@ -830 +830 @@
         $search = '';
         $groupby = '';
+        $fields = "$wpdb->posts.*";
         $post_status_join = false;
+        $page = 1;
+
+        if ( !isset($q['suppress_filters']) )
+            $q['suppress_filters'] = false;
 
         if ( !isset($q['post_type']) ) {
@@ -1362 +1367 @@
         // Apply filters on where and join prior to paging so that any
         // manipulations to them are reflected in the paging by day queries.
-        $where = apply_filters('posts_where', $where);
-        $join = apply_filters('posts_join', $join);
+        if ( !$q['suppress_filters'] ) {
+            $where = apply_filters('posts_where', $where);
+            $join = apply_filters('posts_join', $join);
+        }
 
         // Paging
@@ -1395 +1402 @@
             }
 
-            $cjoin = apply_filters('comment_feed_join', $cjoin);
-            $cwhere = apply_filters('comment_feed_where', $cwhere);
-            $cgroupby = apply_filters('comment_feed_groupby', $cgroupby);
+            if ( !$q['suppress_filters'] ) {
+                $cjoin = apply_filters('comment_feed_join', $cjoin);
+                $cwhere = apply_filters('comment_feed_where', $cwhere);
+                $cgroupby = apply_filters('comment_feed_groupby', $cgroupby);
+            }
 
             $this->comments = (array) $wpdb->get_results("SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby ORDER BY comment_date_gmt DESC LIMIT " . get_option('posts_per_rss'));
@@ -1415 +1424 @@
         }
 
+        $orderby = $q['orderby'];
+
         // Apply post-paging filters on where and join.  Only plugins that
         // manipulate paging queries should use these hooks.
-
-        $where = apply_filters('posts_where_paged', $where);
-        $groupby = apply_filters('posts_groupby', $groupby);
-        $join = apply_filters('posts_join_paged', $join);
-        $orderby = apply_filters('posts_orderby', $q['orderby']);
-        $distinct = apply_filters('posts_distinct', $distinct);
-        $fields = apply_filters('posts_fields', "$wpdb->posts.*");
-        $limits = apply_filters( 'post_limits', $limits );
+        if ( !$q['suppress_filters'] ) {
+            $where = apply_filters('posts_where_paged', $where);
+            $groupby = apply_filters('posts_groupby', $groupby);
+            $join = apply_filters('posts_join_paged', $join);
+            $orderby = apply_filters('posts_orderby', $orderby);
+            $distinct = apply_filters('posts_distinct', $distinct);
+            $fields = apply_filters('posts_fields', $fields);
+            $limits = apply_filters( 'post_limits', $limits );
+        }
 
         // Announce current selection parameters.  For use by caching plugins.
@@ -1430 +1442 @@
 
         // Filter again for the benefit of caching plugins.  Regular plugins should use the hooks above.
-        $where = apply_filters('posts_where_request', $where);
-        $groupby = apply_filters('posts_groupby_request', $groupby);
-        $join = apply_filters('posts_join_request', $join);
-        $orderby = apply_filters('posts_orderby_request', $orderby);
-        $distinct = apply_filters('posts_distinct_request', $distinct);
-        $fields = apply_filters('posts_fields_request', $fields);
-        $limits = apply_filters( 'post_limits_request', $limits );
+        if ( !$q['suppress_filters'] ) {
+            $where = apply_filters('posts_where_request', $where);
+            $groupby = apply_filters('posts_groupby_request', $groupby);
+            $join = apply_filters('posts_join_request', $join);
+            $orderby = apply_filters('posts_orderby_request', $orderby);
+            $distinct = apply_filters('posts_distinct_request', $distinct);
+            $fields = apply_filters('posts_fields_request', $fields);
+            $limits = apply_filters( 'post_limits_request', $limits );
+        }
 
         if ( ! empty($groupby) )
@@ -1446 +1460 @@
             $found_rows = 'SQL_CALC_FOUND_ROWS';
 
-        $request = " SELECT $found_rows $distinct $fields FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
-        $this->request = apply_filters('posts_request', $request);
+        $this->request = " SELECT $found_rows $distinct $fields FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
+        if ( !$q['suppress_filters'] )
+            $this->request = apply_filters('posts_request', $this->request);
 
         $this->posts = $wpdb->get_results($this->request);
         // Raw results filter.  Prior to status checks.
-        $this->posts = apply_filters('posts_results', $this->posts);
+        if ( !$q['suppress_filters'] )
+            $this->posts = apply_filters('posts_results', $this->posts);
 
         if ( !empty($this->posts) && $this->is_comment_feed && $this->is_singular ) {
@@ -1498 +1514 @@
         }
 
-        $this->posts = apply_filters('the_posts', $this->posts);
+        if ( !$q['suppress_filters'] )
+            $this->posts = apply_filters('the_posts', $this->posts);
 
         update_post_caches($this->posts);

tags/2.6.2/wp-includes/version.php

@@ -9 +9 @@
  * @global string $wp_version
  */
-$wp_version = '2.6.1';
+$wp_version = '2.6.2';
 
 /**

tags/2.6.2/wp-includes/widgets.php

@@ -1163 +1163 @@
             }
 
-            echo "<li><a class='rsswidget' href='$link' title='$desc'>$title</a>{$date}{$summary}{$author}</li>";
-        }
+            if ( $link == '' ) {
+                echo "<li>$title{$date}{$summary}{$author}</li>"; 
+            } else {
+                echo "<li><a class='rsswidget' href='$link' title='$desc'>$title</a>{$date}{$summary}{$author}</li>"; 
+            }
+}
         echo '</ul>';
     } else {

tags/2.6.2/wp-login.php

@@ -424 +424 @@
 
     $user = wp_signon('', $secure_cookie);
+
+    $redirect_to = apply_filters('login_redirect', $redirect_to, isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '', $user);
 
     if ( !is_wp_error($user) ) {

tags/2.6.2/wp-settings.php

@@ -102 +102 @@
 
 if ( version_compare( '4.3', phpversion(), '>' ) ) {
-    die( sprintf( /*WP_I18N_OLD_PHP*/'Your server is running PHP version %s but WordPress requires at least 4.3.'/*/WP_I18N_OLD_PHP*/, php_version() ) );
+    die( sprintf( /*WP_I18N_OLD_PHP*/'Your server is running PHP version %s but WordPress requires at least 4.3.'/*/WP_I18N_OLD_PHP*/, phpversion() ) );
 }