Ticket #17944: 17944-3.4-rewrite.diff

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

@@ -181 +181 @@
                         <div class="themedetaildiv hide-if-js">
                                 <p><strong><?php _e('Version: '); ?></strong><?php echo $version; ?></p>
                                 <p><?php echo $theme->display('Description'); ?></p>
-                                <?php if ( current_user_can( 'edit_themes' ) && $theme->parent() ) :
-                                        /* translators: 1: theme title, 2:  template dir, 3: stylesheet_dir, 4: theme title, 5: parent_theme */ ?>
-                                        <p><?php printf( __( 'The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.' ),
-                                                $title, str_replace( WP_CONTENT_DIR, '', $theme->get_template_directory() ), str_replace( WP_CONTENT_DIR, '', $theme->get_stylesheet_directory() ), $title, $theme->parent()->display('Name') ); ?></p>
-                                <?php else :
-                                                /* translators: 1: theme title, 2:  template dir, 3: stylesheet_dir */ ?>
-                                        <p><?php printf( __( 'All of this theme&#8217;s files are located in <code>%2$s</code>.' ),
-                                                $title, str_replace( WP_CONTENT_DIR, '', $theme->get_template_directory() ), str_replace( WP_CONTENT_DIR, '', $theme->get_stylesheet_directory() ) ); ?></p>
-                                <?php endif; ?>
+                                <?php $this->show_files_location( $theme ); ?>
                         </div>
 
                         </div>
@@ -228 +220 @@
         }
 
         /**
+        * Show location of template and theme files
+        *
+        * @param object/array $ct The theme to show it's file locations
+        */
+        function show_files_location( $theme ) {
+                if ( current_user_can( 'edit_themes' ) && $theme->parent() ) {
+                        /* translators: 1: theme title, 2:  template dir, 3: stylesheet_dir, 4: theme title, 5: parent_theme */ ?>
+                        <p><?php printf( __( 'The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.' ),
+                                $theme->display('Name'), str_replace( WP_CONTENT_DIR, '', $theme->get_template_directory() ), str_replace( WP_CONTENT_DIR, '', $theme->get_stylesheet_directory() ), $theme->display('Name'), $theme->parent()->display('Name') ); ?></p>
+                <?php
+                } else {
+                                /* translators: 1: theme title, 2:  template dir, 3: stylesheet_dir */ ?>
+                        <p><?php printf( __( 'All of this theme&#8217;s files are located in <code>%2$s</code>.' ),
+                                $theme->display('Name'), str_replace( WP_CONTENT_DIR, '', $theme->get_template_directory() ), str_replace( WP_CONTENT_DIR, '', $theme->get_stylesheet_directory() ) ); ?></p>
+                <?php
+                }
+        }
+
+        /**
          * Send required variables to JavaScript land
          *
          * @since 3.4

wp-admin/themes.php

@@ -176 +176 @@
                 }
         }
 
+        $wp_list_table->show_files_location( $ct );
+
         if ( $options || current_user_can( 'edit_theme_options' ) ) :
         ?>
         <div class="theme-options">