From 549b5f61aee2f4d0fd362bf6676d588ab79836f9 Mon Sep 17 00:00:00 2001 From: Daryl Koopersmith Date: Mon, 19 Nov 2012 07:24:47 +0000 Subject: [PATCH] Media: Only show the alignment setting when viewing an image. fixes #21836, see #21390. git-svn-id: http://core.svn.wordpress.org/trunk@22671 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/js/media-views.js | 1 + wp-includes/media.php | 44 ++++++++++++++++++----------------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/wp-includes/js/media-views.js b/wp-includes/js/media-views.js index 134160b0b6..021ec1f709 100644 --- a/wp-includes/js/media-views.js +++ b/wp-includes/js/media-views.js @@ -1354,6 +1354,7 @@ model: display[ single.cid ], sizes: single.get('sizes'), priority: 160, + type: single.get('type'), userSettings: state.get('displayUserSettings') }).render() }, options ); diff --git a/wp-includes/media.php b/wp-includes/media.php index 3a5b9d141b..bafb0a4aa6 100644 --- a/wp-includes/media.php +++ b/wp-includes/media.php @@ -1548,28 +1548,30 @@ function wp_print_media_templates( $attachment ) {