Changeset 47218
- Timestamp:
- 02/09/2020 04:51:22 PM (5 years ago)
- Location:
- trunk/src/wp-admin
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/admin.php
r47198 r47218 73 73 * attempt to do no more than threshold value, with some +/- allowed. 74 74 */ 75 if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int) ( $c / 50 ) ) == 1 ) ) {75 if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int) ( $c / 50 ) ) === 1 ) ) { 76 76 require_once ABSPATH . WPINC . '/http.php'; 77 77 $response = wp_remote_get( … … 182 182 183 183 // Back-compat for plugins using add_management_page(). 184 if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook( $plugin_page, 'tools.php' ) ) {184 if ( empty( $page_hook ) && 'edit.php' === $pagenow && '' !== get_plugin_page_hook( $plugin_page, 'tools.php' ) ) { 185 185 // There could be plugin specific params on the URL, so we need the whole query string. 186 186 if ( ! empty( $_SERVER['QUERY_STRING'] ) ) { … … 371 371 * In all other cases, 'load-' . $pagenow should be used instead. 372 372 */ 373 if ( $typenow == 'page') {374 if ( $pagenow == 'post-new.php') {373 if ( 'page' === $typenow ) { 374 if ( 'post-new.php' === $pagenow ) { 375 375 do_action( 'load-page-new.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores 376 } elseif ( $pagenow == 'post.php') {376 } elseif ( 'post.php' === $pagenow ) { 377 377 do_action( 'load-page.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores 378 378 } 379 } elseif ( $pagenow == 'edit-tags.php') {380 if ( $taxnow == 'category') {379 } elseif ( 'edit-tags.php' === $pagenow ) { 380 if ( 'category' === $taxnow ) { 381 381 do_action( 'load-categories.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores 382 } elseif ( $taxnow == 'link_category') {382 } elseif ( 'link_category' === $taxnow ) { 383 383 do_action( 'load-edit-link-categories.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores 384 384 } -
trunk/src/wp-admin/install.php
r47198 r47218 370 370 display_setup_form( __( 'Please provide a valid username.' ) ); 371 371 $error = true; 372 } elseif ( $user_name != sanitize_user( $user_name, true )) {372 } elseif ( sanitize_user( $user_name, true ) != $user_name ) { 373 373 display_setup_form( __( 'The username you provided has invalid characters.' ) ); 374 374 $error = true; … … 387 387 } 388 388 389 if ( $error === false) {389 if ( false === $error ) { 390 390 $wpdb->show_errors(); 391 391 $result = wp_install( $weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ), $loaded_language ); -
trunk/src/wp-admin/media-upload.php
r47198 r47218 34 34 35 35 // Require an ID for the edit screen. 36 if ( isset( $action ) && $action == 'edit'&& ! $ID ) {36 if ( isset( $action ) && 'edit' == $action && ! $ID ) { 37 37 wp_die( 38 38 '<h1>' . __( 'Something went wrong.' ) . '</h1>' . … … 82 82 83 83 // Let the action code decide how to handle the request. 84 if ( $tab == 'type' || $tab == 'type_url'|| ! array_key_exists( $tab, media_upload_tabs() ) ) {84 if ( 'type' == $tab || 'type_url' == $tab || ! array_key_exists( $tab, media_upload_tabs() ) ) { 85 85 /** 86 86 * Fires inside specific upload-type views in the legacy (pre-3.5.0) -
trunk/src/wp-admin/media.php
r47198 r47218 70 70 wp_die( __( 'You attempted to edit an item that isn’t an attachment. Please go back and try again.' ) ); 71 71 } 72 if ( $att->post_status == 'trash') {72 if ( 'trash' == $att->post_status ) { 73 73 wp_die( __( 'You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.' ) ); 74 74 } -
trunk/src/wp-admin/ms-delete-site.php
r47198 r47218 18 18 } 19 19 20 if ( isset( $_GET['h'] ) && $_GET['h'] != '' && get_option( 'delete_blog_hash' ) != false) {20 if ( isset( $_GET['h'] ) && '' != $_GET['h'] && false != get_option( 'delete_blog_hash' ) ) { 21 21 if ( hash_equals( get_option( 'delete_blog_hash' ), $_GET['h'] ) ) { 22 22 wpmu_delete_blog( get_current_blog_id() ); … … 43 43 echo '<h1>' . esc_html( $title ) . '</h1>'; 44 44 45 if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_POST['confirmdelete'] ) && $_POST['confirmdelete'] == '1') {45 if ( isset( $_POST['action'] ) && 'deleteblog' == $_POST['action'] && isset( $_POST['confirmdelete'] ) && '1' == $_POST['confirmdelete'] ) { 46 46 check_admin_referer( 'delete-blog' ); 47 47 -
trunk/src/wp-admin/options.php
r47198 r47218 336 336 foreach ( (array) $options as $option ) : 337 337 $disabled = false; 338 if ( $option->option_name == '') {338 if ( '' == $option->option_name ) { 339 339 continue; 340 340 } -
trunk/src/wp-admin/post.php
r47198 r47218 56 56 $sendback = wp_get_referer(); 57 57 if ( ! $sendback || 58 strpos( $sendback, 'post.php' ) !== false||59 strpos( $sendback, 'post-new.php' ) !== false) {58 false !== strpos( $sendback, 'post.php' ) || 59 false !== strpos( $sendback, 'post-new.php' ) ) { 60 60 if ( 'attachment' == $post_type ) { 61 61 $sendback = admin_url( 'upload.php' ); … … 161 161 $post_new_file = 'media-new.php'; 162 162 } else { 163 if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true) {163 if ( isset( $post_type_object ) && $post_type_object->show_in_menu && true !== $post_type_object->show_in_menu ) { 164 164 $parent_file = $post_type_object->show_in_menu; 165 165 } else { … … 180 180 * @param WP_Post $post Post object. 181 181 */ 182 if ( apply_filters( 'replace_editor', false, $post ) === true) {182 if ( true === apply_filters( 'replace_editor', false, $post ) ) { 183 183 break; 184 184 } … … 310 310 } 311 311 312 if ( $post->post_type == 'attachment') {312 if ( 'attachment' === $post->post_type ) { 313 313 $force = ( ! MEDIA_TRASH ); 314 314 if ( ! wp_delete_attachment( $post_id, $force ) ) { -
trunk/src/wp-admin/update-core.php
r47198 r47218 43 43 $version_string = sprintf( '%s–<strong>%s</strong>', $update->current, $update->locale ); 44 44 45 if ( 'en_US' == $update->locale && 'en_US'== get_locale() ) {45 if ( 'en_US' === $update->locale && 'en_US' === get_locale() ) { 46 46 $version_string = $update->current; 47 } elseif ( 'en_US' == $update->locale && $update->packages->partial && $wp_version == $update->partial_version ) {47 } elseif ( 'en_US' === $update->locale && $update->packages->partial && $wp_version == $update->partial_version ) { 48 48 $updates = get_core_updates(); 49 49 if ( $updates && 1 == count( $updates ) ) { … … 54 54 55 55 $current = false; 56 if ( ! isset( $update->response ) || 'latest' == $update->response ) {56 if ( ! isset( $update->response ) || 'latest' === $update->response ) { 57 57 $current = true; 58 58 } … … 62 62 $mysql_version = $wpdb->db_version(); 63 63 $show_buttons = true; 64 if ( 'development' == $update->response ) {64 if ( 'development' === $update->response ) { 65 65 $message = __( 'You are using a development version of WordPress. You can update to the latest nightly build automatically:' ); 66 66 } else { … … 154 154 } 155 155 } 156 if ( 'en_US' != $update->locale ) {156 if ( 'en_US' !== $update->locale ) { 157 157 if ( ! isset( $update->dismissed ) || ! $update->dismissed ) { 158 158 submit_button( __( 'Hide this update' ), '', 'dismiss', false ); … … 162 162 } 163 163 echo '</p>'; 164 if ( 'en_US' != $update->locale && ( ! isset( $wp_local_package ) || $wp_local_package != $update->locale ) ) {164 if ( 'en_US' !== $update->locale && ( ! isset( $wp_local_package ) || $wp_local_package != $update->locale ) ) { 165 165 echo '<p class="hint">' . __( 'This localized version contains both the translation and various other localization fixes.' ) . '</p>'; 166 } elseif ( 'en_US' == $update->locale && get_locale() != 'en_US'&& ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) {166 } elseif ( 'en_US' === $update->locale && 'en_US' !== get_locale() && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) { 167 167 // Partial builds don't need language-specific warnings. 168 168 echo '<p class="hint">' . sprintf( 169 169 /* translators: %s: WordPress version. */ 170 170 __( 'You are about to install WordPress %s <strong>in English (US).</strong> There is a chance this update will break your translation. You may prefer to wait for the localized version to be released.' ), 171 $update->response != 'development'? $update->current : ''171 'development' !== $update->response ? $update->current : '' 172 172 ) . '</p>'; 173 173 } … … 226 226 $updates = get_core_updates(); 227 227 228 if ( ! isset( $updates[0]->response ) || 'latest' == $updates[0]->response ) {228 if ( ! isset( $updates[0]->response ) || 'latest' === $updates[0]->response ) { 229 229 echo '<h2>'; 230 230 _e( 'You have the latest version of WordPress.' ); … … 257 257 } 258 258 259 if ( isset( $updates[0] ) && $updates[0]->response == 'development') {259 if ( isset( $updates[0] ) && 'development' === $updates[0]->response ) { 260 260 require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; 261 261 $upgrader = new WP_Automatic_Updater; … … 275 275 echo '</ul>'; 276 276 // Don't show the maintenance mode notice when we are only showing a single re-install option. 277 if ( $updates && ( count( $updates ) > 1 || $updates[0]->response != 'latest') ) {277 if ( $updates && ( count( $updates ) > 1 || 'latest' !== $updates[0]->response ) ) { 278 278 echo '<p>' . __( 'While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, your site will return to normal.' ) . '</p>'; 279 279 } elseif ( ! $updates ) { … … 308 308 309 309 $core_updates = get_core_updates(); 310 if ( ! isset( $core_updates[0]->response ) || 'latest' == $core_updates[0]->response || 'development'== $core_updates[0]->response || version_compare( $core_updates[0]->current, $cur_wp_version, '=' ) ) {310 if ( ! isset( $core_updates[0]->response ) || 'latest' === $core_updates[0]->response || 'development' === $core_updates[0]->response || version_compare( $core_updates[0]->current, $cur_wp_version, '=' ) ) { 311 311 $core_update_version = false; 312 312 } else { … … 530 530 $updates = wp_get_translation_updates(); 531 531 if ( ! $updates ) { 532 if ( 'en_US' != get_locale() ) {532 if ( 'en_US' !== get_locale() ) { 533 533 echo '<h2>' . __( 'Translations' ) . '</h2>'; 534 534 echo '<p>' . __( 'Your translations are all up to date.' ) . '</p>'; … … 693 693 if ( ( 'do-theme-upgrade' == $action || ( 'do-plugin-upgrade' == $action && ! isset( $_GET['plugins'] ) ) ) 694 694 && ! isset( $_POST['checked'] ) ) { 695 $upgrade_error = $action == 'do-theme-upgrade'? 'themes' : 'plugins';695 $upgrade_error = 'do-theme-upgrade' == $action ? 'themes' : 'plugins'; 696 696 $action = 'upgrade-core'; 697 697 } … … 714 714 $updates_howto .= '<p>' . __( '<strong>Themes and Plugins</strong> — To update individual themes or plugins from this screen, use the checkboxes to make your selection, then <strong>click on the appropriate “Update” button</strong>. To update all of your themes or plugins at once, you can check the box at the top of the section to select all before clicking the update button.' ) . '</p>'; 715 715 716 if ( 'en_US' != get_locale() ) {716 if ( 'en_US' !== get_locale() ) { 717 717 $updates_howto .= '<p>' . __( '<strong>Translations</strong> — The files translating WordPress into your language are updated for you whenever any other updates occur. But if these files are out of date, you can <strong>click the “Update Translations”</strong> button.' ) . '</p>'; 718 718 } … … 744 744 if ( $upgrade_error ) { 745 745 echo '<div class="error"><p>'; 746 if ( $upgrade_error == 'themes') {746 if ( 'themes' === $upgrade_error ) { 747 747 _e( 'Please select one or more themes to update.' ); 748 748 } else { -
trunk/src/wp-admin/user-new.php
r47198 r47218 64 64 $username = $user_details->user_login; 65 65 $user_id = $user_details->ID; 66 if ( $username != null&& array_key_exists( $blog_id, get_blogs_of_user( $user_id ) ) ) {66 if ( null != $username && array_key_exists( $blog_id, get_blogs_of_user( $user_id ) ) ) { 67 67 $redirect = add_query_arg( array( 'update' => 'addexisting' ), 'user-new.php' ); 68 68 } else {
Note: See TracChangeset
for help on using the changeset viewer.