<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[28412] trunk/src/wp-includes/class-wp-xmlrpc-server.php: Eliminate use of `extract()` in `wp_xmlrpc_server::blogger_editPost()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28412">28412</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-15 03:24:40 +0000 (Thu, 15 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate use of `extract()` in `wp_xmlrpc_server::blogger_editPost()`.
See <a href="http://core.trac.wordpress.org/ticket/22400">#22400</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-xmlrpc-server.php (28411 => 28412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-xmlrpc-server.php 2014-05-15 03:13:44 UTC (rev 28411)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2014-05-15 03:24:40 UTC (rev 28412)
</span><span class="lines">@@ -4209,7 +4209,7 @@
</span><span class="cx"> * @param array $args Method parameters.
</span><span class="cx"> * @return bool true when done.
</span><span class="cx"> */
</span><del>- function blogger_editPost($args) {
</del><ins>+ function blogger_editPost( $args ) {
</ins><span class="cx">
</span><span class="cx"> $this->escape($args);
</span><span class="cx">
</span><span class="lines">@@ -4219,40 +4219,43 @@
</span><span class="cx"> $content = $args[4];
</span><span class="cx"> $publish = $args[5];
</span><span class="cx">
</span><del>- if ( !$user = $this->login($username, $password) )
</del><ins>+ if ( ! $user = $this->login( $username, $password ) ) {
</ins><span class="cx"> return $this->error;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="cx"> do_action( 'xmlrpc_call', 'blogger.editPost' );
</span><span class="cx">
</span><del>- $actual_post = get_post($post_ID,ARRAY_A);
</del><ins>+ $actual_post = get_post( $post_ID, ARRAY_A );
</ins><span class="cx">
</span><del>- if ( !$actual_post || $actual_post['post_type'] != 'post' )
- return new IXR_Error(404, __('Sorry, no such post.'));
</del><ins>+ if ( ! $actual_post || $actual_post['post_type'] != 'post' ) {
+ return new IXR_Error( 404, __( 'Sorry, no such post.' ) );
+ }
</ins><span class="cx">
</span><span class="cx"> $this->escape($actual_post);
</span><span class="cx">
</span><del>- if ( !current_user_can('edit_post', $post_ID) )
</del><ins>+ if ( ! current_user_can( 'edit_post', $post_ID ) ) {
</ins><span class="cx"> return new IXR_Error(401, __('Sorry, you do not have the right to edit this post.'));
</span><ins>+ }
+ if ( 'publish' == $actual_post['post_status'] && ! current_user_can( 'publish_posts' ) ) {
+ return new IXR_Error( 401, __( 'Sorry, you do not have the right to publish this post.' ) );
+ }
</ins><span class="cx">
</span><del>- extract($actual_post, EXTR_SKIP);
</del><ins>+ $postdata = array();
+ $postdata['ID'] = $actual_post['ID'];
+ $postdata['post_content'] = xmlrpc_removepostdata( $content );
+ $postdata['post_title'] = xmlrpc_getposttitle( $content );
+ $postdata['post_category'] = xmlrpc_getpostcategory( $content );
+ $postdata['post_status'] = $actual_post['post_status'];
+ $postdata['post_excerpt'] = $actual_post['post_excerpt'];
</ins><span class="cx">
</span><del>- if ( ('publish' == $post_status) && !current_user_can('publish_posts') )
- return new IXR_Error(401, __('Sorry, you do not have the right to publish this post.'));
</del><ins>+ $result = wp_update_post( $postdata );
</ins><span class="cx">
</span><del>- $post_title = xmlrpc_getposttitle($content);
- $post_category = xmlrpc_getpostcategory($content);
- $post_content = xmlrpc_removepostdata($content);
-
- $postdata = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt');
-
- $result = wp_update_post($postdata);
-
- if ( !$result )
</del><ins>+ if ( ! $result ) {
</ins><span class="cx"> return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be edited.'));
</span><ins>+ }
+ $this->attach_uploads( $actual_post['ID'], $postdata['post_content'] );
</ins><span class="cx">
</span><del>- $this->attach_uploads( $ID, $post_content );
-
</del><span class="cx"> /**
</span><span class="cx"> * Fires after a post has been successfully updated via the XML-RPC Blogger API.
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>