From 796ceebb251d98113f3c09a70805a22cdd8195cf Mon Sep 17 00:00:00 2001 From: Jeremy Felt Date: Sun, 2 Nov 2014 02:24:23 +0000 Subject: [PATCH] Use common core syntax for checking DOING_AJAX Our current check for a non truthy `DOING_AJAX` is `! DOING_AJAX`. props TobiasBg Fixes #29891 Built from https://develop.svn.wordpress.org/trunk@30177 git-svn-id: http://core.svn.wordpress.org/trunk@30177 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/ms.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php index 66c9cb71f1..d2201d34ba 100644 --- a/wp-admin/includes/ms.php +++ b/wp-admin/includes/ms.php @@ -35,7 +35,7 @@ function check_upload_size( $file ) { if ( upload_is_user_over_quota( false ) ) { $file['error'] = __( 'You have used your space quota. Please delete files before uploading.' ); } - if ( $file['error'] != '0' && ! isset( $_POST['html-upload'] ) && ( ! defined( 'DOING_AJAX' ) || DOING_AJAX != true ) ) { + if ( $file['error'] != '0' && ! isset( $_POST['html-upload'] ) && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) ) { wp_die( $file['error'] . ' ' . __( 'Back' ) . '' ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index b50329ea11..eaf891686f 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-alpha-30176'; +$wp_version = '4.1-alpha-30177'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.