Ticket #13774: 13774.2.diff

wp-admin/includes/class-wp-upgrader.php

@@ -661 +661 @@
                 $this->strings['installing_package'] = __('Installing the theme…');
                 $this->strings['process_failed'] = __('Theme install failed.');
                 $this->strings['process_success'] = __('Theme installed successfully.');
+                $this->strings['parent_theme_required'] = __('Preparing to install the parent theme <strong>%s</strong>&#8230;');
         }
 
+        function check_parent_theme_filter($res, $hook_extra, $child_result) {
+                // Check to see if we need to install a 
+                $theme_info = $this->theme_info();
+                $theme_info['Template'] = 'the-common-blog';
+                if ( !empty($theme_info['Template']) ) {
+
+                        $themes = get_themes();
+                        if ( isset($themes[ $theme_info['Template'] ]) )
+                                return $res; // Fall through, we already have the theme
+
+                        foreach ( (array)$themes as $this_theme ) {
+                                if ( !empty($this_theme['Stylesheet']) && $this_theme['Stylesheet'] == $theme_info['Template'] )
+                                        return $res; // Fall through, we already have the theme
+                        }
+
+                        // We don't have the parent theme, lets install it
+                        // First, We'll need to take over the information the skin is displaying..
+                        $child_api = $this->skin->api;
+                        $child_success_message = $this->strings['process_success'];
+
+                        $api = themes_api('theme_information', array('slug' => $theme_info['Template'], 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
+                        $this->skin->api = $api;
+                        /* translators: 1: theme name, 2: version */
+                        $this->strings['process_success'] = sprintf( __('Successfully installed the parent theme <strong>%1$s %2$s</strong>.'), $api->name, $api->version);
+
+                        // Override the 
+                        $this->skin->feedback('parent_theme_required', $api->name . ' ' . $api->version);
+                        remove_filter('upgrader_post_install', array(&$this, 'check_parent_theme_filter'), 10, 3); // This is only needed when we're forcing a template on line 670 above.
+                        add_filter('install_theme_complete_actions', '__return_false'); // Don't show any actions after installing the theme.
+
+                        // Install the parent theme
+                        $this->run( array(
+                                                        'package' => $api->download_link,
+                                                        'destination' => WP_CONTENT_DIR . '/themes',
+                                                        'clear_destination' => false, //Do not overwrite files.
+                                                        'clear_working' => true
+                                                        )
+                                           );
+
+                        //Add error handling here for the parent installation failure.
+                        $parent_result = $this->result;
+
+                        // Start cleaning up after the parents installation
+                        remove_filter('install_theme_complete_actions', '__return_false');
+
+                        // Reset child's result and data
+                        $this->result = $child_result;
+                        $this->skin->api = $child_api;
+//                      $this->skin->set_result($this->result);
+                        $this->strings['process_success'] = $child_success_message;
+                }
+                return $res;
+        }
+
         function install($package) {
 
                 $this->init();
                 $this->install_strings();
 
                 add_filter('upgrader_source_selection', array(&$this, 'check_package') );
+                add_filter('upgrader_post_install', array(&$this, 'check_parent_theme_filter'), 10, 3);
 
                 $options = array(
                                                 'package' => $package,
@@ -680 +736 @@
                 $this->run($options);
 
                 remove_filter('upgrader_source_selection', array(&$this, 'check_package') );
+                remove_filter('upgrader_post_install', array(&$this, 'check_parent_theme_filter'), 10, 3);
 
                 if ( ! $this->result || is_wp_error($this->result) )
                         return $this->result;
@@ -1419 +1476 @@
                 $install_actions = array(
                         'preview' => '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>',
                         'activate' => '<a href="' . $activate_link .  '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>'
-                                                        );
+                );
 
                 if ( is_network_admin() && current_user_can( 'manage_network_themes' ) )
                         $install_actions['network_enable'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=enable&amp;theme=' . $template, 'enable-theme_' . $template ) ) . '" title="' . esc_attr__( 'Enable this theme for all sites in this network' ) . '" target="_parent">' . __( 'Network Enable' ) . '</a>';
@@ -1562 +1619 @@
 
                 return true;
         }
-}
+}
+ No newline at end of file

wp-admin/update.php

@@ -199 +199 @@
                 include_once ABSPATH . 'wp-admin/includes/theme-install.php'; //for themes_api..
 
                 check_admin_referer('install-theme_' . $theme);
-                $api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth.
+                $api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
 
                 if ( is_wp_error($api) )
                         wp_die($api);