<!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>[61224] trunk/src/wp-admin/includes/ajax-actions.php: Coding Standards: Use more meaningful variable names in Admin Ajax actions.</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 { white-space: pre-line; 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/61224">61224</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/61224","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-11-12 14:47:59 +0000 (Wed, 12 Nov 2025)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Use more meaningful variable names in Admin Ajax actions.
Per the [https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#naming-conventions Naming Conventions]:
> Don't abbreviate variable names unnecessarily; let the code be unambiguous and self-documenting.
This commit includes renaming of the following variables:
- `$post_ID` to `$post_id` - {U+201C}Use lowercase letters in variable, action/filter, and function names{U+201D}.
- `$ext_type` to `$extension_type`.
- `$ext` to `$extension`.
- `$id3data` to `$id3_data` - {U+201C}Separate words via underscores{U+201D}.
- `$msg` to `$message`.
- `$sb` to `$sidebar`.
- `$alt` to `$alternate`.
- `$pid` to `$post_id`.
- `$mid` to `$meta_id`.
- `$menu_obj` to `$menu_object`.
- `$noparents` to `$no_parents` - {U+201C}Separate words via underscores{U+201D}.
- `$sup` to `$supplemental`.
- `$cat_id` to `$category_id`.
- `$cat_name` to `$category_name`.
- `$out` to `$output`.
- `$r` to `$edit_result`.
- `$t` to `$taxonomy`.
- `$u` to `$update_result`.
- `$r` to `$result`.
- `$response` to `$response_data`.
- `$x` to `$response`.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/53723">[53723]</a>, <a href="https://core.trac.wordpress.org/changeset/55365">[55365]</a>.
Props costdev, mukesh27, SergeyBiryukov.
See <a href="https://core.trac.wordpress.org/ticket/64226">#64226</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2025-11-12 11:34:56 UTC (rev 61223)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2025-11-12 14:47:59 UTC (rev 61224)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -215,15 +215,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate' ) && function_exists( 'gzdeflate' ) && ! $force_gzip ) {
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Encoding: deflate' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $out = gzdeflate( $test_str, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output = gzdeflate( $test_str, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && function_exists( 'gzencode' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Encoding: gzip' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $out = gzencode( $test_str, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output = gzencode( $test_str, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( -1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo $out;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo $output;
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die();
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'no' === $_GET['test'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( 'update_can_compress_scripts' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -480,7 +480,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $counts = wp_count_comments();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x = new WP_Ajax_Response(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = new WP_Ajax_Response(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'comment',
</span><span class="cx" style="display: block; padding: 0 10px"> // Here for completeness - not used.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -504,7 +504,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->send();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response->send();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $total += $delta;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -552,7 +552,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment( $comment_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $counts = wp_count_comments();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x = new WP_Ajax_Response(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = new WP_Ajax_Response(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'comment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $comment_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -574,7 +574,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->send();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response->send();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -612,23 +612,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $checked_categories = array_map( 'absint', (array) $post_category );
</span><span class="cx" style="display: block; padding: 0 10px"> $popular_ids = wp_popular_terms_checklist( $taxonomy->name, 0, 10, false );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $names as $cat_name ) {
- $cat_name = trim( $cat_name );
- $category_nicename = sanitize_title( $cat_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $names as $category_name ) {
+ $category_name = trim( $category_name );
+ $category_nicename = sanitize_title( $category_name );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' === $category_nicename ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat_id = wp_insert_term( $cat_name, $taxonomy->name, array( 'parent' => $parent ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $category_id = wp_insert_term( $category_name, $taxonomy->name, array( 'parent' => $parent ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $cat_id || is_wp_error( $cat_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $category_id || is_wp_error( $category_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat_id = $cat_id['term_id'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $category_id = $category_id['term_id'];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $checked_categories[] = $cat_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $checked_categories[] = $category_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $parent ) { // Do these all at once in a second.
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -640,7 +640,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 0,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $taxonomy->name,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'descendants_and_self' => $cat_id,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'descendants_and_self' => $category_id,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selected_cats' => $checked_categories,
</span><span class="cx" style="display: block; padding: 0 10px"> 'popular_cats' => $popular_ids,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -650,7 +650,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $add = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => $taxonomy->name,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'id' => $cat_id,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => $category_id,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'data' => str_replace( array( "\n", "\t" ), '', $data ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'position' => -1,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -706,12 +706,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_dropdown_categories( $parent_dropdown_args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sup = ob_get_clean();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $supplemental = ob_get_clean();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $add['supplemental'] = array( 'newcat_parent' => $sup );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $add['supplemental'] = array( 'newcat_parent' => $supplemental );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x = new WP_Ajax_Response( $add );
- $x->send();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = new WP_Ajax_Response( $add );
+ $response->send();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -741,13 +741,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( time() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r = wp_trash_comment( $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = wp_trash_comment( $comment );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_POST['untrash'] ) && '1' === $_POST['untrash'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'trash' !== $status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( time() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r = wp_untrash_comment( $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = wp_untrash_comment( $comment );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Undo trash, not in Trash.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_POST['comment_status'] ) || 'trash' !== $_POST['comment_status'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -758,13 +758,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( time() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r = wp_spam_comment( $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = wp_spam_comment( $comment );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_POST['unspam'] ) && '1' === $_POST['unspam'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'spam' !== $status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( time() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r = wp_unspam_comment( $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = wp_unspam_comment( $comment );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Undo spam, not in spam.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_POST['comment_status'] ) || 'spam' !== $_POST['comment_status'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -771,12 +771,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $delta = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_POST['delete'] ) && '1' === $_POST['delete'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r = wp_delete_comment( $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = wp_delete_comment( $comment );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( -1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $r ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $result ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Decide if we need to send back '1' or a more complicated response including page links and comment counts.
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_ajax_delete_comment_response( $comment->comment_ID, $delta );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -984,7 +984,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment( $id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $comment ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x = new WP_Ajax_Response(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = new WP_Ajax_Response(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'comment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => new WP_Error(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -994,7 +994,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->send();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response->send();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) && ! current_user_can( 'moderate_comments' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1016,13 +1016,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $result ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x = new WP_Ajax_Response(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = new WP_Ajax_Response(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'comment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $result,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->send();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response->send();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Decide if we need to send back '1' or a more complicated response including page links and comment counts.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1050,37 +1050,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( -1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $names = explode( ',', wp_unslash( $_POST['newcat'] ) );
- $x = new WP_Ajax_Response();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $names = explode( ',', wp_unslash( $_POST['newcat'] ) );
+ $response = new WP_Ajax_Response();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $names as $cat_name ) {
- $cat_name = trim( $cat_name );
- $slug = sanitize_title( $cat_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $names as $category_name ) {
+ $category_name = trim( $category_name );
+ $slug = sanitize_title( $category_name );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' === $slug ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat_id = wp_insert_term( $cat_name, 'link_category' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $category_id = wp_insert_term( $category_name, 'link_category' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $cat_id || is_wp_error( $cat_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $category_id || is_wp_error( $category_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat_id = $cat_id['term_id'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $category_id = $category_id['term_id'];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat_name = esc_html( $cat_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $category_name = esc_html( $category_name );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->add(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response->add(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'link-category',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'id' => $cat_id,
- 'data' => "<li id='link-category-$cat_id'><label for='in-link-category-$cat_id' class='selectit'><input value='" . esc_attr( $cat_id ) . "' type='checkbox' checked='checked' name='link_category[]' id='in-link-category-$cat_id'/> $cat_name</label></li>",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => $category_id,
+ 'data' => "<li id='link-category-$category_id'><label for='in-link-category-$category_id' class='selectit'><input value='" . esc_attr( $category_id ) . "' type='checkbox' checked='checked' name='link_category[]' id='in-link-category-$category_id'/> $category_name</label></li>",
</ins><span class="cx" style="display: block; padding: 0 10px"> 'position' => -1,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->send();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $response->send();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1098,7 +1099,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( -1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x = new WP_Ajax_Response();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = new WP_Ajax_Response();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1118,25 +1119,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $error_code = $tag->get_error_code();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->add(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response->add(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'data' => new WP_Error( $error_code, $message ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->send();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response->send();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table = _get_list_table( 'WP_Terms_List_Table', array( 'screen' => $_POST['screen'] ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $level = 0;
- $noparents = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $level = 0;
+ $no_parents = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_taxonomy_hierarchical( $taxonomy ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $level = count( get_ancestors( $tag->term_id, $taxonomy, 'taxonomy' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table->single_row( $tag, $level );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $noparents = ob_get_clean();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $no_parents = ob_get_clean();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1152,19 +1153,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $messages['_item'][1];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->add(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response->add(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'data' => $message,
</span><span class="cx" style="display: block; padding: 0 10px"> 'supplemental' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'parents' => $parents,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'noparents' => $noparents,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'noparents' => $no_parents,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'notice' => $message,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->add(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response->add(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'term',
</span><span class="cx" style="display: block; padding: 0 10px"> 'position' => $level,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1172,7 +1173,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->send();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response->send();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1276,7 +1277,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x = new WP_Ajax_Response();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = new WP_Ajax_Response();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wp_list_table->items as $comment ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1288,7 +1289,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_list_item = ob_get_clean();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->add(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response->add(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'comments',
</span><span class="cx" style="display: block; padding: 0 10px"> 'data' => $comment_list_item,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1295,7 +1296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->send();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response->send();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1426,7 +1427,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_list_item = ob_get_clean();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response_data = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'comment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $comment->comment_ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'data' => $comment_list_item,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1433,8 +1434,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'position' => $position,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $counts = wp_count_comments();
- $response['supplemental'] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $counts = wp_count_comments();
+
+ $response_data['supplemental'] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'in_moderation' => $counts->moderated,
</span><span class="cx" style="display: block; padding: 0 10px"> 'i18n_comments_text' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of comments. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1449,13 +1451,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $comment_auto_approved ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response['supplemental']['parent_approved'] = $parent->comment_ID;
- $response['supplemental']['parent_post_id'] = $parent->comment_post_ID;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response_data['supplemental']['parent_approved'] = $parent->comment_ID;
+ $response_data['supplemental']['parent_post_id'] = $parent->comment_post_ID;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x = new WP_Ajax_Response();
- $x->add( $response );
- $x->send();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = new WP_Ajax_Response();
+ $response->add( $response_data );
+ $response->send();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1503,9 +1505,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table->single_row( $comment );
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_list_item = ob_get_clean();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x = new WP_Ajax_Response();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = new WP_Ajax_Response();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->add(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response->add(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'edit_comment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $comment->comment_ID,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1514,7 +1516,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->send();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response->send();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1575,13 +1577,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_items = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $item_ids as $menu_item_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_obj = get_post( $menu_item_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_object = get_post( $menu_item_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $menu_obj->ID ) ) {
- $menu_obj = wp_setup_nav_menu_item( $menu_obj );
- $menu_obj->title = empty( $menu_obj->title ) ? __( 'Menu Item' ) : $menu_obj->title;
- $menu_obj->label = $menu_obj->title; // Don't show "(pending)" in ajax-added items.
- $menu_items[] = $menu_obj;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $menu_object->ID ) ) {
+ $menu_object = wp_setup_nav_menu_item( $menu_object );
+ $menu_object->title = empty( $menu_object->title ) ? __( 'Menu Item' ) : $menu_object->title;
+ $menu_object->label = $menu_object->title; // Don't show "(pending)" in ajax-added items.
+ $menu_items[] = $menu_object;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1614,12 +1616,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_ajax_add_meta() {
</span><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( 'add-meta', '_ajax_nonce-add-meta' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c = 0;
- $pid = (int) $_POST['post_id'];
- $post = get_post( $pid );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $count = 0;
+ $post_id = (int) $_POST['post_id'];
+ $post = get_post( $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['metakeyselect'] ) || isset( $_POST['metakeyinput'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! current_user_can( 'edit_post', $pid ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! current_user_can( 'edit_post', $post_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( -1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1631,7 +1633,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'auto-draft' === $post->post_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['action'] = 'draft'; // Warning fix.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_data['post_ID'] = $pid;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_data['post_ID'] = $post_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_type'] = $post->post_type;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_status'] = 'draft';
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1643,21 +1645,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> gmdate( __( 'g:i a' ), $now )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pid = edit_post( $post_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = edit_post( $post_data );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $pid ) {
- if ( is_wp_error( $pid ) ) {
- $x = new WP_Ajax_Response(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $post_id ) {
+ if ( is_wp_error( $post_id ) ) {
+ $response = new WP_Ajax_Response(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'meta',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'data' => $pid,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'data' => $post_id,
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->send();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response->send();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mid = add_meta( $pid );
- if ( ! $mid ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta_id = add_meta( $post_id );
+
+ if ( ! $meta_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Please provide a custom field value.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1664,35 +1667,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mid = add_meta( $pid );
- if ( ! $mid ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta_id = add_meta( $post_id );
+
+ if ( ! $meta_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Please provide a custom field value.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta = get_metadata_by_mid( 'post', $mid );
- $pid = (int) $meta->post_id;
- $meta = get_object_vars( $meta );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta = get_metadata_by_mid( 'post', $meta_id );
+ $post_id = (int) $meta->post_id;
+ $meta = get_object_vars( $meta );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x = new WP_Ajax_Response(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = new WP_Ajax_Response(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'meta',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'id' => $mid,
- 'data' => _list_meta_row( $meta, $c ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => $meta_id,
+ 'data' => _list_meta_row( $meta, $count ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'position' => 1,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'supplemental' => array( 'postid' => $pid ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'supplemental' => array( 'postid' => $post_id ),
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else { // Update?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mid = (int) key( $_POST['meta'] );
- $key = wp_unslash( $_POST['meta'][ $mid ]['key'] );
- $value = wp_unslash( $_POST['meta'][ $mid ]['value'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta_id = (int) key( $_POST['meta'] );
+ $key = wp_unslash( $_POST['meta'][ $meta_id ]['key'] );
+ $value = wp_unslash( $_POST['meta'][ $meta_id ]['value'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' === trim( $key ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Please provide a custom field name.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta = get_metadata_by_mid( 'post', $mid );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta = get_metadata_by_mid( 'post', $meta_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $meta ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( 0 ); // If meta doesn't exist.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1707,22 +1711,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $meta->meta_value !== $value || $meta->meta_key !== $key ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = update_metadata_by_mid( 'post', $mid, $value, $key );
- if ( ! $u ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $update_result = update_metadata_by_mid( 'post', $meta_id, $value, $key );
+
+ if ( ! $update_result ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( 0 ); // We know meta exists; we also know it's unchanged (or DB error, in which case there are bigger problems).
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x = new WP_Ajax_Response(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = new WP_Ajax_Response(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'meta',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'id' => $mid,
- 'old_id' => $mid,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => $meta_id,
+ 'old_id' => $meta_id,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'data' => _list_meta_row(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_key' => $key,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_value' => $value,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'meta_id' => $mid,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'meta_id' => $meta_id,
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $c
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1731,7 +1736,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->send();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $response->send();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1757,13 +1763,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $user_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_wp_error( $user_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x = new WP_Ajax_Response(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = new WP_Ajax_Response(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'user',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $user_id,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->send();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response->send();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_object = get_userdata( $user_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1771,7 +1777,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $role = current( $user_object->roles );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x = new WP_Ajax_Response(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = new WP_Ajax_Response(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'user',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $user_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1786,7 +1792,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->send();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response->send();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2080,6 +2086,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $last = wp_check_post_lock( $post_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $last ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $last_user = get_userdata( $last );
</span><span class="cx" style="display: block; padding: 0 10px"> $last_user_name = $last_user ? $last_user->display_name : __( 'Someone' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2261,11 +2268,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( __( 'No items found.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html = '<table class="widefat"><thead><tr><th class="found-radio"><br /></th><th>' . __( 'Title' ) . '</th><th class="no-break">' . __( 'Type' ) . '</th><th class="no-break">' . __( 'Date' ) . '</th><th class="no-break">' . __( 'Status' ) . '</th></tr></thead><tbody>';
- $alt = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html = '<table class="widefat"><thead><tr><th class="found-radio"><br /></th><th>' . __( 'Title' ) . '</th><th class="no-break">' . __( 'Type' ) . '</th><th class="no-break">' . __( 'Date' ) . '</th><th class="no-break">' . __( 'Status' ) . '</th></tr></thead><tbody>';
+ $alternate = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $posts as $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = trim( $post->post_title ) ? $post->post_title : __( '(no title)' );
- $alt = ( 'alternate' === $alt ) ? '' : 'alternate';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = trim( $post->post_title ) ? $post->post_title : __( '(no title)' );
+ $alternate = ( 'alternate' === $alternate ) ? '' : 'alternate';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $post->post_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'publish':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2290,7 +2297,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $time = mysql2date( __( 'Y/m/d' ), $post->post_date );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html .= '<tr class="' . trim( 'found-posts ' . $alt ) . '"><td class="found-radio"><input type="radio" id="found-' . $post->ID . '" name="found_post_id" value="' . esc_attr( $post->ID ) . '"></td>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html .= '<tr class="' . trim( 'found-posts ' . $alternate ) . '"><td class="found-radio"><input type="radio" id="found-' . $post->ID . '" name="found_post_id" value="' . esc_attr( $post->ID ) . '"></td>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $html .= '<td><label for="found-' . $post->ID . '">' . esc_html( $title ) . '</label></td><td class="no-break">' . esc_html( $post_types[ $post->post_type ]->labels->singular_name ) . '</td><td class="no-break">' . esc_html( $time ) . '</td><td class="no-break">' . esc_html( $stat ) . ' </td></tr>' . "\n\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2318,7 +2325,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sidebars = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( wp_unslash( $_POST['sidebars'] ) as $key => $val ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sb = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sidebar = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $val ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $val = explode( ',', $val );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2328,10 +2335,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sb[ $k ] = substr( $v, strpos( $v, '_' ) + 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sidebar[ $k ] = substr( $v, strpos( $v, '_' ) + 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sidebars[ $key ] = $sb;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sidebars[ $key ] = $sidebar;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_sidebars_widgets( $sidebars );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2688,33 +2695,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( "image_editor-$attachment_id" );
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/includes/image-edit.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $msg = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $_POST['do'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'save':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $msg = wp_save_image( $attachment_id );
- if ( ! empty( $msg->error ) ) {
- wp_send_json_error( $msg );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = wp_save_image( $attachment_id );
+ if ( ! empty( $message->error ) ) {
+ wp_send_json_error( $message );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_send_json_success( $msg );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_send_json_success( $message );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'scale':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $msg = wp_save_image( $attachment_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = wp_save_image( $attachment_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'restore':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $msg = wp_restore_image( $attachment_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = wp_restore_image( $attachment_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_image_editor( $attachment_id, $msg );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_image_editor( $attachment_id, $message );
</ins><span class="cx" style="display: block; padding: 0 10px"> $html = ob_get_clean();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $msg->error ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $message->error ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'message' => $msg,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'message' => $message,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'html' => $html,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2722,7 +2729,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_success(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'message' => $msg,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'message' => $message,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'html' => $html,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3039,9 +3046,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'monthnum',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( get_taxonomies_for_attachments( 'objects' ) as $t ) {
- if ( $t->query_var && isset( $query[ $t->query_var ] ) ) {
- $keys[] = $t->query_var;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( get_taxonomies_for_attachments( 'objects' ) as $taxonomy ) {
+ if ( $taxonomy->query_var && isset( $query[ $taxonomy->query_var ] ) ) {
+ $keys[] = $taxonomy->query_var;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3161,23 +3168,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( wp_attachment_is( 'audio', $post['ID'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $changed = false;
- $id3data = wp_get_attachment_metadata( $post['ID'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $changed = false;
+ $id3_data = wp_get_attachment_metadata( $post['ID'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_array( $id3data ) ) {
- $changed = true;
- $id3data = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_array( $id3_data ) ) {
+ $changed = true;
+ $id3_data = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( wp_get_attachment_id3_keys( (object) $post, 'edit' ) as $key => $label ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $changes[ $key ] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $changed = true;
- $id3data[ $key ] = sanitize_text_field( wp_unslash( $changes[ $key ] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $changed = true;
+ $id3_data[ $key ] = sanitize_text_field( wp_unslash( $changes[ $key ] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $changed ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_attachment_metadata( $id, $id3data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_attachment_metadata( $id, $id3_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3432,12 +3439,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Figure out what filter to run:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $type = 'file';
- $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src );
- if ( $ext ) {
- $ext_type = wp_ext2type( $ext );
- if ( 'audio' === $ext_type || 'video' === $ext_type ) {
- $type = $ext_type;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $type = 'file';
+ $extension = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src );
+ if ( $extension ) {
+ $extension_type = wp_ext2type( $extension );
+ if ( 'audio' === $extension_type || 'video' === $extension_type ) {
+ $type = $extension_type;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4899,16 +4906,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see wp_edit_theme_plugin_file()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_ajax_edit_theme_plugin_file() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r = wp_edit_theme_plugin_file( wp_unslash( $_POST ) ); // Validation of args is done in wp_edit_theme_plugin_file().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $edit_result = wp_edit_theme_plugin_file( wp_unslash( $_POST ) ); // Validation of args is done in wp_edit_theme_plugin_file().
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_wp_error( $r ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $edit_result ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error(
</span><span class="cx" style="display: block; padding: 0 10px"> array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'code' => $r->get_error_code(),
- 'message' => $r->get_error_message(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'code' => $edit_result->get_error_code(),
+ 'message' => $edit_result->get_error_message(),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- (array) $r->get_error_data()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ (array) $edit_result->get_error_data()
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>