WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

`detached` affects the `wp()` call for the media list table, so switch our new `$_GET` key to `detach`. 

See #6820.

Built from https://develop.svn.wordpress.org/trunk@31624


git-svn-id: http://core.svn.wordpress.org/trunk@31605 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-03-05 15:59:27 +00:00
parent ec26a08d3c
commit f9c138b4c4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/media.php
View File

@ -3058,11 +3058,11 @@ function wp_media_attach_action( $parent_id, $action = 'attach' ) {
$location = 'upload.php'; $location = 'upload.php';
if ( $referer = wp_get_referer() ) { if ( $referer = wp_get_referer() ) {
if ( false !== strpos( $referer, 'upload.php' ) ) { if ( false !== strpos( $referer, 'upload.php' ) ) {
$location = remove_query_arg( array( 'attached', 'detached' ), $referer ); $location = remove_query_arg( array( 'attached', 'detach' ), $referer );
} }
} }
$key = 'attach' === $action ? 'attached' : 'detached'; $key = 'attach' === $action ? 'attached' : 'detach';
$location = add_query_arg( array( $key => $result ), $location ); $location = add_query_arg( array( $key => $result ), $location );
wp_redirect( $location ); wp_redirect( $location );
exit; exit;

6
wp-admin/upload.php
View File

@ -225,12 +225,12 @@ if ( ! empty( $_GET['posted'] ) ) {
if ( ! empty( $_GET['attached'] ) && $attached = absint( $_GET['attached'] ) ) { if ( ! empty( $_GET['attached'] ) && $attached = absint( $_GET['attached'] ) ) {
$message = sprintf( _n('Reattached %d attachment.', 'Reattached %d attachments.', $attached), $attached ); $message = sprintf( _n('Reattached %d attachment.', 'Reattached %d attachments.', $attached), $attached );
$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detached', 'attached' ), $_SERVER['REQUEST_URI'] ); $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
} }
if ( ! empty( $_GET['detached'] ) && $detached = absint( $_GET['detached'] ) ) { if ( ! empty( $_GET['detach'] ) && $detached = absint( $_GET['detach'] ) ) {
$message = sprintf( _n( 'Detached %d attachment.', 'Detached %d attachments.', $detached ), $detached ); $message = sprintf( _n( 'Detached %d attachment.', 'Detached %d attachments.', $detached ), $detached );
$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detached', 'attached' ), $_SERVER['REQUEST_URI'] ); $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
} }
if ( ! empty( $_GET['deleted'] ) && $deleted = absint( $_GET['deleted'] ) ) { if ( ! empty( $_GET['deleted'] ) && $deleted = absint( $_GET['deleted'] ) ) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31623'; $wp_version = '4.2-alpha-31624';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.