X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/849f15aeed7a5e39314057bdc0064d8edd60dd7d..e0feb3b2e5b436a06bbb04fbc838d1cd6ec95399:/wp-admin/customize.php diff --git a/wp-admin/customize.php b/wp-admin/customize.php index 178db282..6ee2de00 100644 --- a/wp-admin/customize.php +++ b/wp-admin/customize.php @@ -33,6 +33,10 @@ if ( ! $return ) { } } +/** + * @global WP_Scripts $wp_scripts + * @global WP_Customize_Manager $wp_customize + */ global $wp_scripts, $wp_customize; $registered = $wp_scripts->registered; @@ -71,7 +75,7 @@ $body_class = 'wp-core-ui wp-customizer js'; if ( wp_is_mobile() ) : $body_class .= ' mobile'; - ?>">
-
-
is_theme_active() ? __( 'Save & Publish' ) : __( 'Save & Activate' ); - submit_button( $save_text, 'primary save', 'save', false ); + $save_text = $wp_customize->is_theme_active() ? __( 'Save & Publish' ) : __( 'Save & Activate' ); + submit_button( $save_text, 'primary save', 'save', false ); ?> + + + + -
- theme()->get_screenshot(); - $cannot_expand = ! ( $wp_customize->is_theme_active() || $screenshot || $wp_customize->theme()->get('Description') ); - ?> -
-
-
+
+
is_theme_active() ) { - /* translators: %s is the theme name in the Customize/Live Preview pane */ - echo sprintf( __( 'You are previewing %s' ), '' . $wp_customize->theme()->display('Name') . '' ); - } else { - /* translators: %s is the site/panel title in the Customize pane */ - echo sprintf( __( 'You are customizing %s' ), '' . get_bloginfo( 'name' ) . '' ); - } + echo sprintf( __( 'You are customizing %s' ), '' . get_bloginfo( 'name' ) . '' ); ?> +
- -
- is_theme_active() ) : - if ( $screenshot ) : ?> - - - - theme()->get('Description') ): ?> -
theme()->display('Description'); ?>
- -
- +
@@ -175,16 +158,18 @@ do_action( 'customize_controls_print_scripts' );
render_panel_templates(); + $wp_customize->render_section_templates(); $wp_customize->render_control_templates(); /** @@ -220,14 +205,6 @@ do_action( 'customize_controls_print_scripts' ); */ $allowed_urls = array_unique( apply_filters( 'customize_allowed_urls', $allowed_urls ) ); - $fallback_url = add_query_arg( array( - 'preview' => 1, - 'template' => $wp_customize->get_template(), - 'stylesheet' => $wp_customize->get_stylesheet(), - 'preview_iframe' => true, - 'TB_iframe' => 'true' - ), home_url( '/' ) ); - $login_url = add_query_arg( array( 'interim-login' => 1, 'customize-login' => 1 @@ -242,11 +219,10 @@ do_action( 'customize_controls_print_scripts' ); 'url' => array( 'preview' => esc_url_raw( $url ? $url : home_url( '/' ) ), 'parent' => esc_url_raw( admin_url() ), - 'activated' => esc_url_raw( admin_url( 'themes.php?activated=true&previewed' ) ), + 'activated' => esc_url_raw( home_url( '/' ) ), 'ajax' => esc_url_raw( admin_url( 'admin-ajax.php', 'relative' ) ), 'allowed' => array_map( 'esc_url_raw', $allowed_urls ), 'isCrossDomain' => $cross_domain, - 'fallback' => esc_url_raw( $fallback_url ), 'home' => esc_url_raw( home_url( '/' ) ), 'login' => esc_url_raw( $login_url ), ), @@ -268,27 +244,38 @@ do_action( 'customize_controls_print_scripts' ); // Prepare Customize Setting objects to pass to JavaScript. foreach ( $wp_customize->settings() as $id => $setting ) { - $settings['settings'][ $id ] = array( - 'value' => $setting->js_value(), - 'transport' => $setting->transport, - ); + if ( $setting->check_capabilities() ) { + $settings['settings'][ $id ] = array( + 'value' => $setting->js_value(), + 'transport' => $setting->transport, + 'dirty' => $setting->dirty, + ); + } } // Prepare Customize Control objects to pass to JavaScript. foreach ( $wp_customize->controls() as $id => $control ) { - $settings['controls'][ $id ] = $control->json(); + if ( $control->check_capabilities() ) { + $settings['controls'][ $id ] = $control->json(); + } } // Prepare Customize Section objects to pass to JavaScript. foreach ( $wp_customize->sections() as $id => $section ) { - $settings['sections'][ $id ] = $section->json(); + if ( $section->check_capabilities() ) { + $settings['sections'][ $id ] = $section->json(); + } } // Prepare Customize Panel objects to pass to JavaScript. - foreach ( $wp_customize->panels() as $id => $panel ) { - $settings['panels'][ $id ] = $panel->json(); - foreach ( $panel->sections as $section_id => $section ) { - $settings['sections'][ $section_id ] = $section->json(); + foreach ( $wp_customize->panels() as $panel_id => $panel ) { + if ( $panel->check_capabilities() ) { + $settings['panels'][ $panel_id ] = $panel->json(); + foreach ( $panel->sections as $section_id => $section ) { + if ( $section->check_capabilities() ) { + $settings['sections'][ $section_id ] = $section->json(); + } + } } }