Ticket #20027: 20027.3.patch

wp-includes/class-wp-customize-manager.php

@@ -568 +568 @@
                         add_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
 
                         // @link: https://core.trac.wordpress.org/ticket/20027
-                        add_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );
-                        add_filter( 'pre_option_template', array( $this, 'get_template' ) );
+                        add_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
+                        add_filter( 'template', array( $this, 'get_template' ) );
 
                         // Handle custom theme roots.
                         add_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
@@ -606 +606 @@
                         remove_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
 
                         // @link: https://core.trac.wordpress.org/ticket/20027
-                        remove_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );
-                        remove_filter( 'pre_option_template', array( $this, 'get_template' ) );
+                        remove_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
+                        remove_filter( 'template', array( $this, 'get_template' ) );
 
                         // Handle custom theme roots.
                         remove_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );

wp-admin/includes/schema.php

@@ -921 +921 @@
         }
 
         // Set up site tables.
-        $template = get_option( 'template' );
-        $stylesheet = get_option( 'stylesheet' );
+        $template = get_template();
+        $stylesheet = get_stylesheet();
         $allowed_themes = array( $stylesheet => true );
 
         if ( $template != $stylesheet ) {

wp-admin/includes/class-wp-themes-list-table.php

@@ -65 +65 @@
                         }
                 }
 
-                unset( $themes[ get_option( 'stylesheet' ) ] );
+                unset( $themes[ get_stylesheet() ] );
                 WP_Theme::sort_by_name( $themes );
 
                 $per_page = 36;

wp-includes/theme.php

@@ -823 +823 @@
  * @return array|void Theme modifications.
  */
 function get_theme_mods() {
-        $theme_slug = get_option( 'stylesheet' );
+        $theme_slug = get_stylesheet();
         $mods = get_option( "theme_mods_$theme_slug" );
         if ( false === $mods ) {
                 $theme_name = get_option( 'current_theme' );
@@ -904 +904 @@
          */
         $mods[ $name ] = apply_filters( "pre_set_theme_mod_{$name}", $value, $old_value );
 
-        $theme = get_option( 'stylesheet' );
+        $theme = get_stylesheet();
         update_option( "theme_mods_$theme", $mods );
 }
 
@@ -930 +930 @@
                 remove_theme_mods();
                 return;
         }
-        $theme = get_option( 'stylesheet' );
+        $theme = get_stylesheet();
         update_option( "theme_mods_$theme", $mods );
 }
 
@@ -940 +940 @@
  * @since 2.1.0
  */
 function remove_theme_mods() {
-        delete_option( 'theme_mods_' . get_option( 'stylesheet' ) );
+        delete_option( 'theme_mods_' . get_stylesheet() );
 
         // Old style.
         $theme_name = get_option( 'current_theme' );

wp-includes/update.php

@@ -384 +384 @@
         $themes = $checked = $request = array();
 
         // Put slug of current theme into request.
-        $request['active'] = get_option( 'stylesheet' );
+        $request['active'] = get_stylesheet();
 
         foreach ( $installed_themes as $theme ) {
                 $checked[ $theme->get_stylesheet() ] = $theme->get('Version');

wp-admin/network/themes.php

@@ -99 +99 @@
                                 exit;
                         }
 
-                        $themes = array_diff( $themes, array( get_option( 'stylesheet' ), get_option( 'template' ) ) );
+                        $themes = array_diff( $themes, array( get_stylesheet(), get_template() ) );
 
                         if ( empty( $themes ) ) {
                                 wp_safe_redirect( add_query_arg( 'error', 'main', $referer ) );

wp-admin/includes/class-wp-ms-themes-list-table.php

@@ -463 +463 @@
                         );
                 }
 
-                if ( ! $allowed && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && $stylesheet != get_option( 'stylesheet' ) && $stylesheet != get_option( 'template' ) ) {
+                if ( ! $allowed && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && $stylesheet != get_stylesheet() && $stylesheet != get_template() ) {
                         $url = add_query_arg( array(
                                 'action'       => 'delete-selected',
                                 'checked[]'    => $theme_key,