<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16824] trunk/wp-includes/class-wp-xmlrpc-server.php:
Work around some unset variable notices in xmlrpc.php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16824">16824</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-12-08 22:00:40 +0000 (Wed, 08 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Work around some unset variable notices in xmlrpc.php. props redsweater. props sorich87. fixes <a href="http://trac.wordpress.org/ticket/10665">#10665</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpxmlrpcserverphp">trunk/wp-includes/class-wp-xmlrpc-server.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-xmlrpc-server.php (16823 => 16824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2010-12-08 21:35:08 UTC (rev 16823)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2010-12-08 22:00:40 UTC (rev 16824)
</span><span class="lines">@@ -1258,7 +1258,7 @@
</span><span class="cx">
</span><span class="cx"> $comment['comment_parent'] = isset($content_struct['comment_parent']) ? absint($content_struct['comment_parent']) : 0;
</span><span class="cx">
</span><del>- $comment['comment_content'] = $content_struct['content'];
</del><ins>+ $comment['comment_content'] = isset($content_struct['content']) ? $content_struct['content'] : null;
</ins><span class="cx">
</span><span class="cx"> do_action('xmlrpc_call', 'wp.newComment');
</span><span class="cx">
</span><span class="lines">@@ -2179,8 +2179,8 @@
</span><span class="cx"> $post_author = $content_struct["wp_author_id"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $post_title = $content_struct['title'];
- $post_content = $content_struct['description'];
</del><ins>+ $post_title = isset( $content_struct['title'] ) ? $content_struct['title'] : null;
+ $post_content = isset( $content_struct['description'] ) ? $content_struct['description'] : null;
</ins><span class="cx">
</span><span class="cx"> $post_status = $publish ? 'publish' : 'draft';
</span><span class="cx">
</span><span class="lines">@@ -2202,10 +2202,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $post_excerpt = $content_struct['mt_excerpt'];
- $post_more = $content_struct['mt_text_more'];
</del><ins>+ $post_excerpt = isset($content_struct['mt_excerpt']) ? $content_struct['mt_excerpt'] : null;
+ $post_more = isset($content_struct['mt_text_more']) ? $content_struct['mt_text_more'] : null;
</ins><span class="cx">
</span><del>- $tags_input = $content_struct['mt_keywords'];
</del><ins>+ $tags_input = isset($content_struct['mt_keywords']) ? $content_struct['mt_keywords'] : null;
</ins><span class="cx">
</span><span class="cx"> if ( isset($content_struct["mt_allow_comments"]) ) {
</span><span class="cx"> if ( !is_numeric($content_struct["mt_allow_comments"]) ) {
</span><span class="lines">@@ -2271,9 +2271,12 @@
</span><span class="cx"> if ( $post_more )
</span><span class="cx"> $post_content = $post_content . "<!--more-->" . $post_more;
</span><span class="cx">
</span><del>- $to_ping = $content_struct['mt_tb_ping_urls'];
- if ( is_array($to_ping) )
- $to_ping = implode(' ', $to_ping);
</del><ins>+ $to_ping = null;
+ if ( isset( $content_struct['mt_tb_ping_urls'] ) ) {
+ $to_ping = $content_struct['mt_tb_ping_urls'];
+ if ( is_array($to_ping) )
+ $to_ping = implode(' ', $to_ping);
+ }
</ins><span class="cx">
</span><span class="cx"> // Do some timestamp voodoo
</span><span class="cx"> if ( !empty( $content_struct['date_created_gmt'] ) )
</span><span class="lines">@@ -2289,13 +2292,15 @@
</span><span class="cx"> $post_date_gmt = current_time('mysql', 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $catnames = $content_struct['categories'];
- logIO('O', 'Post cats: ' . var_export($catnames,true));
</del><span class="cx"> $post_category = array();
</span><ins>+ if ( isset( $content_struct['categories'] ) ) {
+ $catnames = $content_struct['categories'];
+ logIO('O', 'Post cats: ' . var_export($catnames,true));
</ins><span class="cx">
</span><del>- if ( is_array($catnames) ) {
- foreach ($catnames as $cat) {
- $post_category[] = get_cat_ID($cat);
</del><ins>+ if ( is_array($catnames) ) {
+ foreach ($catnames as $cat) {
+ $post_category[] = get_cat_ID($cat);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2321,7 +2326,8 @@
</span><span class="cx"> $this->set_custom_fields($post_ID, $content_struct['custom_fields']);
</span><span class="cx">
</span><span class="cx"> // Handle enclosures
</span><del>- $this->add_enclosure_if_new($post_ID, $content_struct['enclosure']);
</del><ins>+ $thisEnclosure = isset($content_struct['enclosure']) ? $content_struct['enclosure'] : null;
+ $this->add_enclosure_if_new($post_ID, $thisEnclosure);
</ins><span class="cx">
</span><span class="cx"> $this->attach_uploads( $post_ID, $post_content );
</span><span class="cx">
</span><span class="lines">@@ -2549,20 +2555,21 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $post_title = $content_struct['title'];
- $post_content = $content_struct['description'];
- $catnames = $content_struct['categories'];
</del><ins>+ $post_title = isset( $content_struct['title'] ) ? $content_struct['title'] : null;
+ $post_content = isset( $content_struct['description'] ) ? $content_struct['description'] : null;
</ins><span class="cx">
</span><span class="cx"> $post_category = array();
</span><del>-
- if ( is_array($catnames) ) {
- foreach ($catnames as $cat) {
- $post_category[] = get_cat_ID($cat);
</del><ins>+ if ( isset( $content_struct['categories'] ) ) {
+ $catnames = $content_struct['categories'];
+ if ( is_array($catnames) ) {
+ foreach ($catnames as $cat) {
+ $post_category[] = get_cat_ID($cat);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $post_excerpt = $content_struct['mt_excerpt'];
- $post_more = $content_struct['mt_text_more'];
</del><ins>+ $post_excerpt = isset( $content_struct['mt_excerpt'] ) ? $content_struct['mt_excerpt'] : null;
+ $post_more = isset( $content_struct['mt_text_more'] ) ? $content_struct['mt_text_more'] : null;
</ins><span class="cx">
</span><span class="cx"> $post_status = $publish ? 'publish' : 'draft';
</span><span class="cx"> if ( isset( $content_struct["{$post_type}_status"] ) ) {
</span><span class="lines">@@ -2583,7 +2590,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $tags_input = $content_struct['mt_keywords'];
</del><ins>+ $tags_input = isset( $content_struct['mt_keywords'] ) ? $content_struct['mt_keywords'] : null;
</ins><span class="cx">
</span><span class="cx"> if ( ('publish' == $post_status) ) {
</span><span class="cx"> if ( ( 'page' == $post_type ) && !current_user_can('publish_pages') )
</span><span class="lines">@@ -2595,9 +2602,12 @@
</span><span class="cx"> if ( $post_more )
</span><span class="cx"> $post_content = $post_content . "<!--more-->" . $post_more;
</span><span class="cx">
</span><del>- $to_ping = $content_struct['mt_tb_ping_urls'];
- if ( is_array($to_ping) )
- $to_ping = implode(' ', $to_ping);
</del><ins>+ $to_ping = null;
+ if ( isset( $content_struct['mt_tb_ping_urls'] ) ) {
+ $to_ping = $content_struct['mt_tb_ping_urls'];
+ if ( is_array($to_ping) )
+ $to_ping = implode(' ', $to_ping);
+ }
</ins><span class="cx">
</span><span class="cx"> // Do some timestamp voodoo
</span><span class="cx"> if ( !empty( $content_struct['date_created_gmt'] ) )
</span><span class="lines">@@ -2635,7 +2645,8 @@
</span><span class="cx"> $this->set_custom_fields($post_ID, $content_struct['custom_fields']);
</span><span class="cx">
</span><span class="cx"> // Handle enclosures
</span><del>- $this->add_enclosure_if_new($post_ID, $content_struct['enclosure']);
</del><ins>+ $thisEnclosure = isset($content_struct['enclosure']) ? $content_struct['enclosure'] : null;
+ $this->add_enclosure_if_new($post_ID, $thisEnclosure);
</ins><span class="cx">
</span><span class="cx"> $this->attach_uploads( $ID, $post_content );
</span><span class="cx">
</span><span class="lines">@@ -3512,4 +3523,4 @@
</span><span class="cx"> return $pingbacks;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-?>
</del><ins>+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>