Remove trailing whitespace
git-svn-id: http://svn.automattic.com/wordpress/trunk@11971 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
@@ -60,10 +60,10 @@ function wp_import_cleanup( $id ) {
|
||||
*/
|
||||
function wp_import_handle_upload() {
|
||||
if ( !isset($_FILES['import']) ) {
|
||||
$file['error'] = __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' );
|
||||
$file['error'] = __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' );
|
||||
return $file;
|
||||
}
|
||||
|
||||
|
||||
$overrides = array( 'test_form' => false, 'test_type' => false );
|
||||
$_FILES['import']['name'] .= '.txt';
|
||||
$file = wp_handle_upload( $_FILES['import'], $overrides );
|
||||
|
||||
@@ -347,12 +347,12 @@ function deactivate_plugins($plugins, $silent= false) {
|
||||
continue;
|
||||
if ( ! $silent )
|
||||
do_action( 'deactivate_plugin', trim( $plugin ) );
|
||||
|
||||
|
||||
$key = array_search( $plugin, (array) $current );
|
||||
|
||||
|
||||
if ( false !== $key )
|
||||
array_splice( $current, $key, 1 );
|
||||
|
||||
|
||||
//Used by Plugin updater to internally deactivate plugin, however, not to notify plugins of the fact to prevent plugin output.
|
||||
if ( ! $silent ) {
|
||||
do_action( 'deactivate_' . trim( $plugin ) );
|
||||
@@ -489,7 +489,7 @@ function delete_plugins($plugins, $redirect = '' ) {
|
||||
}
|
||||
|
||||
function validate_active_plugins() {
|
||||
$check_plugins = apply_filters( 'active_plugins', get_option('active_plugins') );
|
||||
$check_plugins = apply_filters( 'active_plugins', get_option('active_plugins') );
|
||||
|
||||
// Sanity check. If the active plugin list is not an array, make it an
|
||||
// empty array.
|
||||
|
||||
@@ -589,7 +589,7 @@ function add_meta( $post_ID ) {
|
||||
|
||||
$wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->postmeta (post_id,meta_key,meta_value ) VALUES (%s, %s, %s)", $post_ID, $metakey, $metavalue) );
|
||||
do_action( 'added_postmeta', $wpdb->insert_id, $post_ID, $metakey, $metavalue );
|
||||
|
||||
|
||||
return $wpdb->insert_id;
|
||||
}
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user