diff --git a/wp-admin/includes/class-wp-importer.php b/wp-admin/includes/class-wp-importer.php index 17ffaa3a59..ee10547deb 100644 --- a/wp-admin/includes/class-wp-importer.php +++ b/wp-admin/includes/class-wp-importer.php @@ -209,7 +209,7 @@ class WP_Importer { */ public function is_user_over_quota() { if ( function_exists( 'upload_is_user_over_quota' ) ) { - if ( upload_is_user_over_quota( 1 ) ) { + if ( upload_is_user_over_quota() ) { echo "Sorry, you have used your upload quota.\n"; return true; } diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php index 39a8bce185..1152e64e12 100644 --- a/wp-admin/includes/class-wp-list-table.php +++ b/wp-admin/includes/class-wp-list-table.php @@ -337,7 +337,7 @@ class WP_List_Table { \n"; - submit_button( __( 'Apply' ), 'action', false, false, array( 'id' => "doaction$two" ) ); + submit_button( __( 'Apply' ), 'action', '', false, array( 'id' => "doaction$two" ) ); echo "\n"; } diff --git a/wp-admin/includes/class-wp-media-list-table.php b/wp-admin/includes/class-wp-media-list-table.php index 436ed40f35..483421b527 100644 --- a/wp-admin/includes/class-wp-media-list-table.php +++ b/wp-admin/includes/class-wp-media-list-table.php @@ -315,7 +315,7 @@ foreach ( $columns as $column_name => $column_display_name ) { echo $thumb; } else { ?> - + @@ -332,7 +332,7 @@ foreach ( $columns as $column_name => $column_display_name ) { is_trash || ! $user_can_edit ) { echo $att_title; } else { ?> - $column_display_name ) { if ( $this->detached ) { if ( current_user_can( 'edit_post', $post->ID ) ) - $actions['edit'] = '' . __( 'Edit' ) . ''; + $actions['edit'] = '' . __( 'Edit' ) . ''; if ( current_user_can( 'delete_post', $post->ID ) ) if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) { $actions['trash'] = "ID ) . "'>" . __( 'Trash' ) . ""; @@ -515,7 +515,7 @@ foreach ( $columns as $column_name => $column_display_name ) { } else { if ( current_user_can( 'edit_post', $post->ID ) && !$this->is_trash ) - $actions['edit'] = '' . __( 'Edit' ) . ''; + $actions['edit'] = '' . __( 'Edit' ) . ''; if ( current_user_can( 'delete_post', $post->ID ) ) { if ( $this->is_trash ) $actions['untrash'] = "ID ) . "'>" . __( 'Restore' ) . ""; diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php index 3c035a7fb0..194448660a 100644 --- a/wp-admin/includes/class-wp-posts-list-table.php +++ b/wp-admin/includes/class-wp-posts-list-table.php @@ -695,7 +695,7 @@ class WP_Posts_List_Table extends WP_List_Table { $actions = array(); if ( $can_edit_post && 'trash' != $post->post_status ) { - $actions['edit'] = '' . __( 'Edit' ) . ''; + $actions['edit'] = '' . __( 'Edit' ) . ''; $actions['inline hide-if-no-js'] = '' . __( 'Quick Edit' ) . ''; } if ( current_user_can( 'delete_post', $post->ID ) ) { diff --git a/wp-includes/session.php b/wp-includes/session.php index 9b93d41dc5..1d7c5d01a1 100644 --- a/wp-includes/session.php +++ b/wp-includes/session.php @@ -434,6 +434,6 @@ class WP_User_Meta_Session_Tokens extends WP_Session_Tokens { * @static */ public static function drop_sessions() { - delete_metadata( 'user', false, 'session_tokens', false, true ); + delete_metadata( 'user', 0, 'session_tokens', false, true ); } } diff --git a/wp-includes/version.php b/wp-includes/version.php index 9760143969..17144e6dde 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31219'; +$wp_version = '4.2-alpha-31220'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.