diff options
Diffstat (limited to 'wp-includes')
-rw-r--r-- | wp-includes/class-IXR.php | 34 | ||||
-rw-r--r-- | wp-includes/pluggable.php | 1 | ||||
-rw-r--r-- | wp-includes/version.php | 4 |
3 files changed, 19 insertions, 20 deletions
diff --git a/wp-includes/class-IXR.php b/wp-includes/class-IXR.php index a77f6c9..0016ac5 100644 --- a/wp-includes/class-IXR.php +++ b/wp-includes/class-IXR.php @@ -1,5 +1,5 @@ <?php -/* +/* IXR - The Inutio XML-RPC Library - (c) Incutio Ltd 2002-2005 Version 1.7 (beta) - Simon Willison, 23rd May 2005 Site: http://scripts.incutio.com/xmlrpc/ @@ -47,7 +47,7 @@ class IXR_Value { } // If it is a normal PHP object convert it in to a struct if (is_object($this->data)) { - + $this->data = get_object_vars($this->data); return 'struct'; } @@ -254,7 +254,7 @@ class IXR_Message { } } $this->_currentTagContents = ''; - } + } } @@ -379,7 +379,7 @@ EOD; 'specUrl' => 'http://www.xmlrpc.com/discuss/msgReader$1208', 'specVersion' => 1 ), - ); + ); } function getCapabilities($args) { return $this->capabilities; @@ -584,7 +584,7 @@ class IXR_Error { </struct> </value> </fault> -</methodResponse> +</methodResponse> EOD; return $xml; @@ -658,27 +658,27 @@ class IXR_IntrospectionServer extends IXR_Server { 'specVersion' => 1 ); $this->addCallback( - 'system.methodSignature', - 'this:methodSignature', - array('array', 'string'), + 'system.methodSignature', + 'this:methodSignature', + array('array', 'string'), 'Returns an array describing the return type and required parameters of a method' ); $this->addCallback( - 'system.getCapabilities', - 'this:getCapabilities', - array('struct'), + 'system.getCapabilities', + 'this:getCapabilities', + array('struct'), 'Returns a struct describing the XML-RPC specifications supported by this server' ); $this->addCallback( - 'system.listMethods', - 'this:listMethods', - array('array'), + 'system.listMethods', + 'this:listMethods', + array('array'), 'Returns an array of available methods on this server' ); $this->addCallback( - 'system.methodHelp', - 'this:methodHelp', - array('string', 'string'), + 'system.methodHelp', + 'this:methodHelp', + array('string', 'string'), 'Returns a documentation string for the specified method' ); } diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index d9dae0f..9ead34b 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -248,7 +248,6 @@ function wp_mail( $to, $subject, $message, $headers = '' ) { // Set the from name and email $phpmailer->From = apply_filters( 'wp_mail_from', $from_email ); - $phpmailer->Sender = apply_filters( 'wp_mail_from', $from_email ); $phpmailer->FromName = apply_filters( 'wp_mail_from_name', $from_name ); // Set destination address diff --git a/wp-includes/version.php b/wp-includes/version.php index bc15aab..f691583 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -2,8 +2,8 @@ // This holds the version number in a separate file so we can bump it without cluttering the SVN -$wp_version = '2.3.2'; -$wpmu_version = '1.3.2'; +$wp_version = '2.3.3'; +$wpmu_version = '1.3.3'; $wp_db_version = 6124; ?> |