<!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>[47853] trunk/src/wp-admin/network: Coding Standards: Use strict comparison in `wp-admin/network` where static strings are involved.</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/47853">47853</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/47853","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>2020-05-24 09:14:21 +0000 (Sun, 24 May 2020)</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 strict comparison in `wp-admin/network` where static strings are involved.
Includes minor code layout fixes for better readability.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/47808">[47808]</a>.
See <a href="https://core.trac.wordpress.org/ticket/49542">#49542</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminnetworkplugininstallphp">trunk/src/wp-admin/network/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminnetworksettingsphp">trunk/src/wp-admin/network/settings.php</a></li>
<li><a href="#trunksrcwpadminnetworksiteinfophp">trunk/src/wp-admin/network/site-info.php</a></li>
<li><a href="#trunksrcwpadminnetworksitenewphp">trunk/src/wp-admin/network/site-new.php</a></li>
<li><a href="#trunksrcwpadminnetworksitesettingsphp">trunk/src/wp-admin/network/site-settings.php</a></li>
<li><a href="#trunksrcwpadminnetworksitethemesphp">trunk/src/wp-admin/network/site-themes.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="#trunksrcwpadminnetworkthemeinstallphp">trunk/src/wp-admin/network/theme-install.php</a></li>
<li><a href="#trunksrcwpadminnetworkusernewphp">trunk/src/wp-admin/network/user-new.php</a></li>
<li><a href="#trunksrcwpadminnetworkusersphp">trunk/src/wp-admin/network/users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminnetworkplugininstallphp"></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/plugin-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/plugin-install.php 2020-05-24 09:13:39 UTC (rev 47852)
+++ trunk/src/wp-admin/network/plugin-install.php 2020-05-24 09:14:21 UTC (rev 47853)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</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( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_GET['tab'] ) && ( 'plugin-information' === $_GET['tab'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> define( 'IFRAME_REQUEST', true );
</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="trunksrcwpadminnetworksettingsphp"></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/settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/settings.php 2020-05-24 09:13:39 UTC (rev 47852)
+++ trunk/src/wp-admin/network/settings.php 2020-05-24 09:14:21 UTC (rev 47853)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( network_admin_url( $redirect ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} elseif ( ! empty( $_GET['dismiss'] ) && 'new_network_admin_email' == $_GET['dismiss'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( ! empty( $_GET['dismiss'] ) && 'new_network_admin_email' === $_GET['dismiss'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'dismiss_new_network_admin_email' );
</span><span class="cx" style="display: block; padding: 0 10px"> delete_site_option( 'network_admin_hash' );
</span><span class="cx" style="display: block; padding: 0 10px"> delete_site_option( 'new_admin_email' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,9 +255,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $limited_email_domains = get_site_option( 'limited_email_domains' );
</span><span class="cx" style="display: block; padding: 0 10px"> $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $limited_email_domains ) {
+ $limited_email_domains = implode( "\n", (array) $limited_email_domains );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea name="limited_email_domains" id="limited_email_domains" aria-describedby="limited-email-domains-desc" cols="45" rows="5">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php echo esc_textarea( '' == $limited_email_domains ? '' : implode( "\n", (array) $limited_email_domains ) ); ?></textarea>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php echo esc_textarea( $limited_email_domains ); ?></textarea>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="limited-email-domains-desc">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -267,8 +271,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="banned_email_domains"><?php _e( 'Banned Email Domains' ); ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $banned_email_domains = get_site_option( 'banned_email_domains' );
+
+ if ( $banned_email_domains ) {
+ $banned_email_domains = implode( "\n", (array) $banned_email_domains );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <textarea name="banned_email_domains" id="banned_email_domains" aria-describedby="banned-email-domains-desc" cols="45" rows="5">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php echo esc_textarea( get_site_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_site_option( 'banned_email_domains' ) ) ); ?></textarea>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php echo esc_textarea( $banned_email_domains ); ?></textarea>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="banned-email-domains-desc">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'If you want to ban domains from site registrations. One domain per line.' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="trunksrcwpadminnetworksiteinfophp"></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-info.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-info.php 2020-05-24 09:13:39 UTC (rev 47852)
+++ trunk/src/wp-admin/network/site-info.php 2020-05-24 09:14:21 UTC (rev 47853)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_scheme = parse_url( $details->siteurl, PHP_URL_SCHEME );
</span><span class="cx" style="display: block; padding: 0 10px"> $is_main_site = is_main_site( $id );
</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['action'] ) && 'update-site' == $_REQUEST['action'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_REQUEST['action'] ) && 'update-site' === $_REQUEST['action'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'edit-site' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['update'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $messages = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'updated' == $_GET['update'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'updated' === $_GET['update'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $messages[] = __( 'Site info updated.' );
</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="trunksrcwpadminnetworksitenewphp"></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-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-new.php 2020-05-24 09:13:39 UTC (rev 47852)
+++ trunk/src/wp-admin/network/site-new.php 2020-05-24 09:14:21 UTC (rev 47853)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>' ) . '</p>'
</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['action'] ) && 'add-site' == $_REQUEST['action'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_REQUEST['action'] ) && 'add-site' === $_REQUEST['action'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'add-blog', '_wpnonce_add-blog' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $_POST['blog'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,6 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->hide_errors();
</span><span class="cx" style="display: block; padding: 0 10px"> $id = wpmu_create_blog( $newdomain, $path, $title, $user_id, $meta, get_current_network_id() );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->show_errors();
</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 ( ! is_wp_error( $id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_super_admin( $user_id ) && ! get_user_option( 'primary_blog', $user_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_option( $user_id, 'primary_blog', $id, true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +188,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['update'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $messages = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'added' == $_GET['update'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'added' === $_GET['update'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $messages[] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Dashboard URL, 2: Network admin edit URL. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Site added. <a href="%1$s">Visit Dashboard</a> or <a href="%2$s">Edit Site</a>' ),
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitesettingsphp"></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-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-settings.php 2020-05-24 09:13:39 UTC (rev 47852)
+++ trunk/src/wp-admin/network/site-settings.php 2020-05-24 09:14:21 UTC (rev 47853)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $is_main_site = is_main_site( $id );
</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['action'] ) && 'update-site' == $_REQUEST['action'] && is_array( $_POST['option'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_REQUEST['action'] ) && 'update-site' === $_REQUEST['action'] && is_array( $_POST['option'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'edit-site' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $key = wp_unslash( $key );
</span><span class="cx" style="display: block; padding: 0 10px"> $val = wp_unslash( $val );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === $key || is_array( $val ) || in_array( $key, $skip_options, true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- continue; // Avoids "0 is a protected WP option and may not be modified" error when edit blog options.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ continue; // Avoids "0 is a protected WP option and may not be modified" error when editing blog options.
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( $key, $val );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['update'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $messages = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'updated' == $_GET['update'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'updated' === $_GET['update'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $messages[] = __( 'Site options updated.' );
</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">@@ -123,12 +123,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '%' . $wpdb->esc_like( 'user_roles' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $options = $wpdb->get_results( $query );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $options as $option ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'default_role' === $option->option_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $editblog_default_role = $option->option_value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $disabled = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $class = 'all-options';
</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 ( is_serialized( $option->option_value ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_serialized_string( $option->option_value ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $option->option_value = esc_html( maybe_unserialize( $option->option_value ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,6 +141,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $class = 'all-options disabled';
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( strpos( $option->option_value, "\n" ) !== false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,6 +162,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } // End foreach.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires at the end of the Edit Site form, before the submit button.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitethemesphp"></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-themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-themes.php 2020-05-24 09:13:39 UTC (rev 47852)
+++ trunk/src/wp-admin/network/site-themes.php 2020-05-24 09:14:21 UTC (rev 47853)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,7 +158,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</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( $_GET['action'] ) && 'update-site' == $_GET['action'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_GET['action'] ) && 'update-site' === $_GET['action'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( $referer );
</span><span class="cx" style="display: block; padding: 0 10px"> exit();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +188,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['enabled'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $enabled = absint( $_GET['enabled'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 1 == $enabled ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 === $enabled ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'Theme enabled.' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of themes. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +197,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $enabled ) ) . '</p></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_GET['disabled'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $disabled = absint( $_GET['disabled'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 1 == $disabled ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 === $disabled ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'Theme disabled.' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of themes. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,7 +204,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message = _n( '%s theme disabled.', '%s themes disabled.', $disabled );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $disabled ) ) . '</p></div>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( isset( $_GET['error'] ) && 'none' === $_GET['error'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'No theme selected.' ) . '</p></div>';
</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 2020-05-24 09:13:39 UTC (rev 47852)
+++ trunk/src/wp-admin/network/site-users.php 2020-05-24 09:14:21 UTC (rev 47853)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,6 +77,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $update = 'err_add_fail';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $update = 'newuser';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after a user has been created via the network site-users.php page.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,9 +179,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> $userids = $_REQUEST['users'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-admin/network/site-themes.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $referer = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $referer, $action, $userids, $id ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $update = $action;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $update = $action;
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +193,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</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( $_GET['action'] ) && 'update-site' == $_GET['action'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_GET['action'] ) && 'update-site' === $_GET['action'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( $referer );
</span><span class="cx" style="display: block; padding: 0 10px"> exit();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2020-05-24 09:13:39 UTC (rev 47852)
+++ trunk/src/wp-admin/network/sites.php 2020-05-24 09:14:21 UTC (rev 47853)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,11 +223,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to change the current site.' ) );
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $doaction, array( 'delete', 'spam', 'notspam' ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_to = wp_get_referer();
</span><span class="cx" style="display: block; padding: 0 10px"> $blogs = (array) $_POST['allblogs'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-admin/network/site-themes.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_to = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $redirect_to, $doaction, $blogs, $id ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( $redirect_to );
</span><span class="cx" style="display: block; padding: 0 10px"> exit();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,6 +240,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( '_wp_http_referer', '_wpnonce' ),
</span><span class="cx" style="display: block; padding: 0 10px"> add_query_arg( $_POST, network_admin_url( 'sites.php' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( $location );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,6 +274,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $id The ID of the site being deactivated.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'deactivate_blog', $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"> update_blog_status( $id, 'deleted', '1' );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminnetworkthemeinstallphp"></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/theme-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/theme-install.php 2020-05-24 09:13:39 UTC (rev 47852)
+++ trunk/src/wp-admin/network/theme-install.php 2020-05-24 09:14:21 UTC (rev 47853)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</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( $_GET['tab'] ) && ( 'theme-information' == $_GET['tab'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_GET['tab'] ) && ( 'theme-information' === $_GET['tab'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> define( 'IFRAME_REQUEST', true );
</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="trunksrcwpadminnetworkusernewphp"></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/user-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/user-new.php 2020-05-24 09:13:39 UTC (rev 47852)
+++ trunk/src/wp-admin/network/user-new.php 2020-05-24 09:14:21 UTC (rev 47853)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>' ) . '</p>'
</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['action'] ) && 'add-user' == $_REQUEST['action'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_REQUEST['action'] ) && 'add-user' === $_REQUEST['action'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'add-user', '_wpnonce_add-user' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_network_users' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,6 +44,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user = wp_unslash( $_POST['user'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_details = wpmu_validate_user_signup( $user['username'], $user['email'] );
</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 ( is_wp_error( $user_details['errors'] ) && $user_details['errors']->has_errors() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $add_user_errors = $user_details['errors'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,6 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id ID of the newly created user.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'network_user_new_created_user', $user_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"> wp_redirect(
</span><span class="cx" style="display: block; padding: 0 10px"> add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +79,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['update'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $messages = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'added' == $_GET['update'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'added' === $_GET['update'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $edit_link = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['user_id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id_new = absint( $_GET['user_id'] );
</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 2020-05-24 09:13:39 UTC (rev 47852)
+++ trunk/src/wp-admin/network/users.php 2020-05-24 09:14:21 UTC (rev 47853)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'deleteuser' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = intval( $_GET['id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '0' != $id && '1' != $id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $id > 1 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST['allusers'] = array( $id ); // confirm_delete_users() can only handle arrays.
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __( 'Users' );
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'users.php';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,8 +116,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $doaction, array( 'delete', 'spam', 'notspam' ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sendback = wp_get_referer();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_ids = (array) $_POST['allusers'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_ids = (array) $_POST['allusers'];
</del><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-admin/network/site-themes.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $sendback = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $sendback, $doaction, $user_ids ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,7 @@
</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">- if ( ! empty( $_POST['delete'] ) && 'reassign' == $_POST['delete'][ $blogid ][ $id ] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $_POST['delete'] ) && 'reassign' === $_POST['delete'][ $blogid ][ $id ] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_user_from_blog( $id, $blogid, (int) $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> remove_user_from_blog( $id, $blogid );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +165,9 @@
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $i = 0;
</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 ( is_array( $_POST['user'] ) && ! empty( $_POST['user'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $_POST['user'] as $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'delete_user', $id ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,7 +178,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">- if ( 1 == $i ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 === $i ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $deletefunction = 'delete';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $deletefunction = 'all_delete';
</span></span></pre>
</div>
</div>
</body>
</html>