Changes from tags/2.6.2 at r8849 to tags/2.6.3 at r9310

Location:

tags/2.6.3

Files:

• wp-admin/includes/media.php (modified) (2 diffs)
• wp-includes/class-snoopy.php (modified) (7 diffs)
• wp-includes/version.php (modified) (1 diff)

tags/2.6.3/wp-admin/includes/media.php

@@ -619 +619 @@
             'html'       => "
                 <input type='text' name='attachments[$post->ID][url]' value='" . attribute_escape($file) . "' /><br />
-                <button type='button' class='button url-$post->ID' value=''>" . __('None') . "</button>
-                <button type='button' class='button url-$post->ID' value='" . attribute_escape($file) . "'>" . __('File URL') . "</button>
-                <button type='button' class='button url-$post->ID' value='" . attribute_escape($link) . "'>" . __('Post URL') . "</button>
+                <button type='button' class='button url-$post->ID' title=''>" . __('None') . "</button>
+                <button type='button' class='button url-$post->ID' title='" . attribute_escape($file) . "'>" . __('File URL') . "</button>
+                <button type='button' class='button url-$post->ID' title='" . attribute_escape($link) . "'>" . __('Post URL') . "</button>
                 <script type='text/javascript'>
-                jQuery('button.url-$post->ID').bind('click', function(){jQuery(this).siblings('input').val(this.value);});
+                jQuery('button.url-$post->ID').bind('click', function(){jQuery(this).siblings('input').val(jQuery(this).attr('title'));});
                 </script>\n",
             'helps'      => __('Enter a link URL or click above for presets.'),
@@ -814 +814 @@
             $item .= $field[$field['input']];
         elseif ( $field['input'] == 'textarea' ) {
-            $item .= "<textarea type='text' id='$name' name='$name'>" . attribute_escape( $field['value'] ) . $aria_required . "</textarea>";
+            $item .= "<textarea type='text' id='$name' name='$name'" . $aria_required . ">" . htmlspecialchars( $field['value'] ) . "</textarea>";
         } else {
             $item .= "<input type='text' id='$name' name='$name' value='" . attribute_escape( $field['value'] ) . "'" . $aria_required . "/>";

tags/2.6.3/wp-includes/class-snoopy.php

@@ -1 +1 @@
 <?php
-/**
- * Snoopy - the PHP net client
- * @author Monte Ohrt <monte@ispi.net>
- * @copyright 1999-2000 ispi, all rights reserved
- * @version 1.01
- * @license GNU Lesser GPL
- * @link http://snoopy.sourceforge.net/
- * @package Snoopy
- */
-
 if ( !in_array('Snoopy', get_declared_classes() ) ) :
-/**
- * Snoopy - the PHP net client
- *
- * @author Monte Ohrt <monte@ispi.net>
- * @copyright (c): 1999-2000 ispi, all rights reserved
- * @version 1.01
- *
+/*************************************************
+
+Snoopy - the PHP net client
+Author: Monte Ohrt <monte@ispi.net>
+Copyright (c): 1999-2008 New Digital Group, all rights reserved
+Version: 1.2.4
+
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -31 +21 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * You may contact the author of Snoopy by e-mail at:
- * monte@ispi.net
- *
- * Or, write to:
- * Monte Ohrt
- * CTO, ispi
- * 237 S. 70th suite 220
- * Lincoln, NE 68510
- *
- * @link http://snoopy.sourceforge.net/ The latest version of Snoopy can be
- *      obtained
- */
+
+You may contact the author of Snoopy by e-mail at:
+monte@ohrt.com
+
+The latest version of Snoopy can be obtained from:
+http://snoopy.sourceforge.net/
+
+*************************************************/
+
 class Snoopy
 {
@@ -57 +43 @@
     var $proxy_pass     =   "";                 // proxy password to use
 
-    var $agent          =   "Snoopy v1.2.3";    // agent we masquerade as
+    var $agent          =   "Snoopy v1.2.4";    // agent we masquerade as
     var $referer        =   "";                 // referer info to pass
     var $cookies        =   array();            // array of cookies to pass
@@ -86 +72 @@
     var $response_code  =   "";                 // response code returned from server
     var $headers        =   array();            // headers returned from server sent here
-    var $maxlength      =   8192;               // max return data length (body)
+    var $maxlength      =   500000;             // max return data length (body)
     var $read_timeout   =   0;                  // timeout on read operations, in seconds
                                                 // supported only since PHP 4 Beta 4
@@ -1021 +1007 @@
         $headerfile = tempnam($temp_dir, "sno");
 
-        $safer_URI = strtr( $URI, "\"", " " ); // strip quotes from the URI to avoid shell access
-        exec(escapeshellcmd($this->curl_path." -D \"$headerfile\"".$cmdline_params." \"".$safer_URI."\""),$results,$return);
+        exec($this->curl_path." -k -D \"$headerfile\"".$cmdline_params." \"".escapeshellcmd($URI)."\"",$results,$return);
 
         if($return)
@@ -1246 +1231 @@
 
                         $fp = fopen($file_name, "r");
-                        while (!feof($fp)) {
-                            $file_content .= fread($fp, filesize($file_name));
-                        }
+                        $file_content = fread($fp, filesize($file_name));
                         fclose($fp);
                         $base_name = basename($file_name);
@@ -1265 +1248 @@
 }
 endif;
-
 ?>

tags/2.6.3/wp-includes/version.php

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