<!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>[49944] trunk/src: Quick/Bulk Edit: By the power vested in me, I hereby declare the top bulk actions and the bottom bulk actions joined forever in MatrimonyScript.</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/49944">49944</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/49944","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-01-07 16:21:09 +0000 (Thu, 07 Jan 2021)</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'>Quick/Bulk Edit: By the power vested in me, I hereby declare the top bulk actions and the bottom bulk actions joined forever in MatrimonyScript.
This joyous marriage means that users will no longer find a selected top bulk action on a list table unexpectedly being applied instead of their selected bottom bulk action. The top and bottom controls for changing user roles are equally wedded forever too.
Props clayray, subrataemfluence, garrett-eclipse, pbiron, hareesh-pillai
Fixes <a href="https://core.trac.wordpress.org/ticket/46872">#46872</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesadmincommonjs">trunk/src/js/_enqueues/admin/common.js</a></li>
<li><a href="#trunksrcjs_enqueuesadmineditcommentsjs">trunk/src/js/_enqueues/admin/edit-comments.js</a></li>
<li><a href="#trunksrcjs_enqueuesadmininlineeditpostjs">trunk/src/js/_enqueues/admin/inline-edit-post.js</a></li>
<li><a href="#trunksrcjs_enqueuesadminmediajs">trunk/src/js/_enqueues/admin/media.js</a></li>
<li><a href="#trunksrcwpadmincssformscss">trunk/src/wp-admin/css/forms.css</a></li>
<li><a href="#trunksrcwpadmineditcommentsphp">trunk/src/wp-admin/edit-comments.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswptermslisttablephp">trunk/src/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpuserslisttablephp">trunk/src/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminnetworksiteusersphp">trunk/src/wp-admin/network/site-users.php</a></li>
<li><a href="#trunksrcwpadminnetworksitesphp">trunk/src/wp-admin/network/sites.php</a></li>
<li><a href="#trunksrcwpadminnetworkusersphp">trunk/src/wp-admin/network/users.php</a></li>
<li><a href="#trunksrcwpadminusersphp">trunk/src/wp-admin/users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesadmincommonjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/common.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/common.js 2021-01-07 16:07:20 UTC (rev 49943)
+++ trunk/src/js/_enqueues/admin/common.js 2021-01-07 16:21:09 UTC (rev 49944)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1220,6 +1220,62 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Marries a secondary control to its primary control.
+ *
+ * @param {jQuery} topSelector The top selector element.
+ * @param {jQuery} topSubmit The top submit element.
+ * @param {jQuery} bottomSelector The bottom selector element.
+ * @param {jQuery} bottomSubmit The bottom submit element.
+ * @return {void}
+ */
+ function marryControls( topSelector, topSubmit, bottomSelector, bottomSubmit ) {
+ /**
+ * Updates the primary selector when the secondary selector is changed.
+ *
+ * @since 5.7.0
+ *
+ * @return {void}
+ */
+ function updateTopSelector() {
+ topSelector.val($(this).val());
+ }
+ bottomSelector.on('change', updateTopSelector);
+
+ /**
+ * Updates the secondary selector when the primary selector is changed.
+ *
+ * @since 5.7.0
+ *
+ * @return {void}
+ */
+ function updateBottomSelector() {
+ bottomSelector.val($(this).val());
+ }
+ topSelector.on('change', updateBottomSelector);
+
+ /**
+ * Triggers the primary submit when then secondary submit is clicked.
+ *
+ * @since 5.7.0
+ *
+ * @return {void}
+ */
+ function triggerSubmitClick(e) {
+ e.preventDefault();
+ e.stopPropagation();
+
+ topSubmit.trigger('click');
+ }
+ bottomSubmit.on('click', triggerSubmitClick);
+ }
+
+ // Marry the secondary "Bulk actions" controls to the primary controls:
+ marryControls( $('#bulk-action-selector-top'), $('#doaction'), $('#bulk-action-selector-bottom'), $('#doaction2') );
+
+ // Marry the secondary "Change role to" controls to the primary controls:
+ marryControls( $('#new_role'), $('#changeit'), $('#new_role2'), $('#changeit2') );
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Shows row actions on focus of its parent container element or any other elements contained within.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return {void}
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1321,9 +1377,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> pageInput.closest('form').submit( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * action = bulk action dropdown at the top of the table
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * action2 = bulk action dropdow at the bottom of the table
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $('select[name="action"]').val() == -1 && $('select[name="action2"]').val() == -1 && pageInput.val() == currentPage )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $('select[name="action"]').val() == -1 && pageInput.val() == currentPage )
</ins><span class="cx" style="display: block; padding: 0 10px"> pageInput.val('1');
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcjs_enqueuesadmineditcommentsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/edit-comments.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/edit-comments.js 2021-01-07 16:07:20 UTC (rev 49943)
+++ trunk/src/js/_enqueues/admin/edit-comments.js 2021-01-07 16:21:09 UTC (rev 49944)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -808,7 +808,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> commentReply.toggle($(this).parent());
</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">- $('#doaction, #doaction2, #post-query-submit').click(function(){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $('#doaction, #post-query-submit').click(function(){
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $('#the-comment-list #replyrow').length > 0 )
</span><span class="cx" style="display: block; padding: 0 10px"> commentReply.close();
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span></span></pre></div>
<a id="trunksrcjs_enqueuesadmininlineeditpostjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/inline-edit-post.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/inline-edit-post.js 2021-01-07 16:07:20 UTC (rev 49943)
+++ trunk/src/js/_enqueues/admin/inline-edit-post.js 2021-01-07 16:21:09 UTC (rev 49944)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Adds onclick events to the apply buttons.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('#doaction, #doaction2').click(function(e){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $('#doaction').click(function(e){
</ins><span class="cx" style="display: block; padding: 0 10px"> var n;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> t.whichBulkButtonId = $( this ).attr( 'id' );
</span></span></pre></div>
<a id="trunksrcjs_enqueuesadminmediajs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/media.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/media.js 2021-01-07 16:07:20 UTC (rev 49943)
+++ trunk/src/js/_enqueues/admin/media.js 2021-01-07 16:21:09 UTC (rev 49944)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,13 +178,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#find-posts-close' ).click( findPosts.close );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Binds the bulk action events to the submit buttons.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '#doaction, #doaction2' ).click( function( event ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#doaction' ).click( function( event ) {
</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">- * Retrieves all select elements for bulk actions that have a name starting with `action`
- * and handle its action based on its value.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Handle the bulk action based on its value.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( 'select[name^="action"]' ).each( function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( 'select[name="action"]' ).each( function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> var optionValue = $( this ).val();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'attach' === optionValue ) {
</span></span></pre></div>
<a id="trunksrcwpadmincssformscss"></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/css/forms.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/forms.css 2021-01-07 16:07:20 UTC (rev 49943)
+++ trunk/src/wp-admin/css/forms.css 2021-01-07 16:21:09 UTC (rev 49944)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -492,6 +492,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0 8px 0 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* @since 5.7.0 secondary bulk action controls require JS. */
+.no-js label[for="bulk-action-selector-bottom"],
+.no-js select#bulk-action-selector-bottom,
+.no-js input#doaction2,
+.no-js label[for="new_role2"],
+.no-js select#new_role2,
+.no-js input#changeit2 {
+ display: none;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .tablenav .actions select {
</span><span class="cx" style="display: block; padding: 0 10px"> float: left;
</span><span class="cx" style="display: block; padding: 0 10px"> margin-right: 6px;
</span></span></pre></div>
<a id="trunksrcwpadmineditcommentsphp"></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/edit-comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-comments.php 2021-01-07 16:07:20 UTC (rev 49943)
+++ trunk/src/wp-admin/edit-comments.php 2021-01-07 16:21:09 UTC (rev 49944)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $doaction = 'delete';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_REQUEST['delete_comments'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = $_REQUEST['delete_comments'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $doaction = ( '-1' !== $_REQUEST['action'] ) ? $_REQUEST['action'] : $_REQUEST['action2'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $doaction = $_REQUEST['action'];
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_REQUEST['ids'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = array_map( 'absint', explode( ',', $_REQUEST['ids'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( wp_get_referer() ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswplisttablephp"></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/class-wp-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-list-table.php 2021-01-07 16:07:20 UTC (rev 49943)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2021-01-07 16:21:09 UTC (rev 49944)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -526,10 +526,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $_REQUEST['action'];
</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 ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] ) {
- return $_REQUEST['action2'];
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswptermslisttablephp"></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/class-wp-terms-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2021-01-07 16:07:20 UTC (rev 49943)
+++ trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2021-01-07 16:21:09 UTC (rev 49944)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function current_action() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' === $_REQUEST['action'] || 'delete' === $_REQUEST['action2'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && 'delete' === $_REQUEST['action'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'bulk-delete';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpuserslisttablephp"></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/class-wp-users-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-users-list-table.php 2021-01-07 16:07:20 UTC (rev 49943)
+++ trunk/src/wp-admin/includes/class-wp-users-list-table.php 2021-01-07 16:21:09 UTC (rev 49944)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,8 +335,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The bulk action required.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function current_action() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( isset( $_REQUEST['changeit'] ) || isset( $_REQUEST['changeit2'] ) ) &&
- ( ! empty( $_REQUEST['new_role'] ) || ! empty( $_REQUEST['new_role2'] ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_REQUEST['changeit'] ) && ! empty( $_REQUEST['new_role'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'promote';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminnetworksiteusersphp"></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/network/site-users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-users.php 2021-01-07 16:07:20 UTC (rev 49943)
+++ trunk/src/wp-admin/network/site-users.php 2021-01-07 16:21:09 UTC (rev 49944)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,12 +140,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'promote':
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'bulk-users' );
</span><span class="cx" style="display: block; padding: 0 10px"> $editable_roles = get_editable_roles();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $role = false;
- if ( ! empty( $_REQUEST['new_role2'] ) ) {
- $role = $_REQUEST['new_role2'];
- } elseif ( ! empty( $_REQUEST['new_role'] ) ) {
- $role = $_REQUEST['new_role'];
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $role = $_REQUEST['new_role'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $editable_roles[ $role ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to give users that role.' ), 403 );
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitesphp"></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/network/sites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/sites.php 2021-01-07 16:07:20 UTC (rev 49943)
+++ trunk/src/wp-admin/network/sites.php 2021-01-07 16:21:09 UTC (rev 49944)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,8 +177,8 @@
</span><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"> case 'allblogs':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( isset( $_POST['action'] ) || isset( $_POST['action2'] ) ) && isset( $_POST['allblogs'] ) ) {
- $doaction = -1 != $_POST['action'] ? $_POST['action'] : $_POST['action2'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_POST['action'] ) && isset( $_POST['allblogs'] ) ) {
+ $doaction = $_POST['action'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $_POST['allblogs'] as $key => $val ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '0' != $val && get_network()->site_id != $val ) {
</span></span></pre></div>
<a id="trunksrcwpadminnetworkusersphp"></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/network/users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/users.php 2021-01-07 16:07:20 UTC (rev 49943)
+++ trunk/src/wp-admin/network/users.php 2021-01-07 16:21:09 UTC (rev 49944)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,10 +46,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
</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 ( ( isset( $_POST['action'] ) || isset( $_POST['action2'] ) ) && isset( $_POST['allusers'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_POST['action'] ) && isset( $_POST['allusers'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'bulk-users-network' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $doaction = -1 != $_POST['action'] ? $_POST['action'] : $_POST['action2'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $doaction = $_POST['action'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $userfunction = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $_POST['allusers'] as $user_id ) {
</span></span></pre></div>
<a id="trunksrcwpadminusersphp"></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/users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/users.php 2021-01-07 16:07:20 UTC (rev 49943)
+++ trunk/src/wp-admin/users.php 2021-01-07 16:21:09 UTC (rev 49944)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,12 +112,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"> $editable_roles = get_editable_roles();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $role = false;
- if ( ! empty( $_REQUEST['new_role2'] ) ) {
- $role = $_REQUEST['new_role2'];
- } elseif ( ! empty( $_REQUEST['new_role'] ) ) {
- $role = $_REQUEST['new_role'];
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $role = $_REQUEST['new_role'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $role || empty( $editable_roles[ $role ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to give users that role.' ), 403 );
</span></span></pre>
</div>
</div>
</body>
</html>