<!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>[13175] trunk/wp-admin/admin-ajax.php: Fix notices, props sivel.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13175">13175</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-17 12:26:47 +0000 (Wed, 17 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix notices, props sivel. Fixes <a href="http://trac.wordpress.org/ticket/12122">#12122</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (13174 => 13175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-02-17 12:13:34 UTC (rev 13174)
+++ trunk/wp-admin/admin-ajax.php 2010-02-17 12:26:47 UTC (rev 13175)
</span><span class="lines">@@ -15,6 +15,10 @@
</span><span class="cx"> define('WP_ADMIN', true);
</span><span class="cx">
</span><span class="cx"> require_once('../wp-load.php');
</span><ins>+
+if ( ! isset( $_REQUEST['action'] ) )
+ die('-1');
+
</ins><span class="cx"> require_once('includes/admin.php');
</span><span class="cx"> @header('Content-Type: text/html; charset=' . get_option('blog_charset'));
</span><span class="cx">
</span><span class="lines">@@ -22,22 +26,22 @@
</span><span class="cx">
</span><span class="cx"> if ( ! is_user_logged_in() ) {
</span><span class="cx">
</span><del>- if ( $_POST['action'] == 'autosave' ) {
</del><ins>+ if ( isset( $_POST['action'] ) && $_POST['action'] == 'autosave' ) {
</ins><span class="cx"> $id = isset($_POST['post_ID'])? (int) $_POST['post_ID'] : 0;
</span><span class="cx">
</span><span class="cx"> if ( ! $id )
</span><span class="cx"> die('-1');
</span><span class="cx">
</span><span class="cx"> $message = sprintf( __('<strong>ALERT: You are logged out!</strong> Could not save draft. <a href="%s" target="_blank">Please log in again.</a>'), wp_login_url() );
</span><del>- $x = new WP_Ajax_Response( array(
- 'what' => 'autosave',
- 'id' => $id,
- 'data' => $message
- ) );
- $x->send();
</del><ins>+ $x = new WP_Ajax_Response( array(
+ 'what' => 'autosave',
+ 'id' => $id,
+ 'data' => $message
+ ) );
+ $x->send();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty( $_REQUEST['action']) )
</del><ins>+ if ( !empty( $_REQUEST['action'] ) )
</ins><span class="cx"> do_action( 'wp_ajax_nopriv_' . $_REQUEST['action'] );
</span><span class="cx">
</span><span class="cx"> die('-1');
</span></span></pre>
</div>
</div>
</body>
</html>