Changes in branches/2.8 [12077:12176]

Location:

branches/2.8

Files:

• readme.html (modified) (2 diffs)
• wp-admin/press-this.php (modified) (3 diffs)
• wp-includes/formatting.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)
• wp-includes/js/swfupload/plugins/swfupload.speed.js (modified) (1 prop)
• wp-includes/version.php (modified) (1 diff)

branches/2.8/readme.html

@@ -9 +9 @@
 <h1 id="logo" style="text-align: center">
     <img alt="WordPress" src="wp-admin/images/wordpress-logo.png" />
-    <br /> Version 2.8.5
+    <br /> Version 2.8.6
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>
@@ -30 +30 @@
 <h1>Upgrading</h1>
 <p>Before you upgrade anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</p>
-<h2>Upgrading from any previous WordPress to 2.8.5:</h2>
+<h2>Upgrading from any previous WordPress to 2.8.6:</h2>
 <ol>
     <li>Delete your old WP files, saving ones you've modified.</li>

branches/2.8/wp-admin/press-this.php

@@ -92 +92 @@
 
 // Set Variables
-$title = isset($_GET['t']) ? esc_html(aposfix(stripslashes($_GET['t']))) : '';
-$selection = isset($_GET['s']) ? trim( aposfix( stripslashes($_GET['s']) ) ) : '';
+$title = isset( $_GET['t'] ) ? trim( strip_tags( aposfix( stripslashes( $_GET['t'] ) ) ) ) : '';
+$selection = isset( $_GET['s'] ) ? trim( htmlspecialchars( html_entity_decode( aposfix( stripslashes( $_GET['s'] ) ) ) ) ) : '';
 if ( ! empty($selection) ) {
     $selection = preg_replace('/(\r?\n|\r)/', '</p><p>', $selection);
@@ -118 +118 @@
         <h2><label for="embed-code"><?php _e('Embed Code') ?></label></h2>
         <div class="inside">
-            <textarea name="embed-code" id="embed-code" rows="8" cols="40"><?php echo format_to_edit($selection, true); ?></textarea>
+            <textarea name="embed-code" id="embed-code" rows="8" cols="40"><?php echo wp_htmledit_pre( $selection ); ?></textarea>
             <p id="options"><a href="#" class="select button"><?php _e('Insert Video'); ?></a> <a href="#" class="close button"><?php _e('Cancel'); ?></a></p>
         </div>
@@ -549 +549 @@
             <div class="editor-container">
                 <textarea name="content" id="content" style="width:100%;" class="mceEditor" rows="15">
-                    <?php if ($selection) echo wp_richedit_pre(htmlspecialchars_decode($selection)); ?>
-                    <?php if ($url) { echo '<p>'; if($selection) _e('via '); echo "<a href='$url'>$title</a>."; echo '</p>'; } ?>
+                    <?php if ($selection) echo wp_richedit_pre( $selection ); ?>
+                    <?php if ($url) { echo '<p>'; if($selection) _e('via '); printf( "<a href='%s'>%s</a>.", esc_url( $url ), esc_html( $title ) ); echo '</p>'; } ?>
                 </textarea>
             </div>

branches/2.8/wp-includes/formatting.php

@@ -606 +606 @@
     $filename = preg_replace('/[\s-]+/', '-', $filename);
     $filename = trim($filename, '.-_');
+
+    // Split the filename into a base and extension[s]
+    $parts = explode('.', $filename);
+
+    // Return if only one extension
+    if ( count($parts) <= 2 )
+        return apply_filters('sanitize_file_name', $filename, $filename_raw);
+
+    // Process multiple extensions
+    $filename = array_shift($parts);
+    $extension = array_pop($parts);
+    $mimes = get_allowed_mime_types();
+
+    // Loop over any intermediate extensions.  Munge them with a trailing underscore if they are a 2 - 5 character
+    // long alpha string not in the extension whitelist.
+    foreach ( (array) $parts as $part) {
+        $filename .= '.' . $part;
+        
+        if ( preg_match("/^[a-zA-Z]{2,5}\d?$/", $part) ) {
+            $allowed = false;
+            foreach ( $mimes as $ext_preg => $mime_match ) {
+                $ext_preg = '!(^' . $ext_preg . ')$!i';
+                if ( preg_match( $ext_preg, $part ) ) {
+                    $allowed = true;
+                    break;
+                }
+            }
+            if ( !$allowed )
+                $filename .= '_';
+        }
+    }
+    $filename .= '.' . $extension;
+
     return apply_filters('sanitize_file_name', $filename, $filename_raw);
 }

branches/2.8/wp-includes/functions.php

@@ -2227 +2227 @@
  */
 function wp_check_filetype( $filename, $mimes = null ) {
-    // Accepted MIME types are set here as PCRE unless provided.
-    $mimes = ( is_array( $mimes ) ) ? $mimes : apply_filters( 'upload_mimes', array(
+    if ( empty($mimes) )
+        $mimes = get_allowed_mime_types();
+    $type = false;
+    $ext = false;
+
+    foreach ( $mimes as $ext_preg => $mime_match ) {
+        $ext_preg = '!\.(' . $ext_preg . ')$!i';
+        if ( preg_match( $ext_preg, $filename, $ext_matches ) ) {
+            $type = $mime_match;
+            $ext = $ext_matches[1];
+            break;
+        }
+    }
+
+    return compact( 'ext', 'type' );
+}
+
+/**
+ * Retrieve list of allowed mime types and file extensions.
+ *
+ * @since 2.8.6
+ *
+ * @return array Array of mime types keyed by the file extension regex corresponding to those types.
+ */
+function get_allowed_mime_types() {
+    static $mimes = false;
+
+    if ( !$mimes ) {
+        // Accepted MIME types are set here as PCRE unless provided.
+        $mimes = apply_filters( 'upload_mimes', array(
         'jpg|jpeg|jpe' => 'image/jpeg',
         'gif' => 'image/gif',
@@ -2274 +2302 @@
         'odb' => 'application/vnd.oasis.opendocument.database',
         'odf' => 'application/vnd.oasis.opendocument.formula',
-        )
-    );
-
-    $type = false;
-    $ext = false;
-
-    foreach ( $mimes as $ext_preg => $mime_match ) {
-        $ext_preg = '!\.(' . $ext_preg . ')$!i';
-        if ( preg_match( $ext_preg, $filename, $ext_matches ) ) {
-            $type = $mime_match;
-            $ext = $ext_matches[1];
-            break;
-        }
-    }
-
-    return compact( 'ext', 'type' );
+        ) );
+    }
+
+    return $mimes;
 }
 

branches/2.8/wp-includes/version.php

@@ -9 +9 @@
  * @global string $wp_version
  */
-$wp_version = '2.8.5';
+$wp_version = '2.8.6';
 
 /**