Changeset 20589

Timestamp:

04/25/2012 05:34:19 PM (14 years ago)

Author:

nacin

Message:

Remove WP_Theme::is_child_theme() in favor of WP_Theme::parent(). see #20546.

Location:

trunk

Files:

• wp-admin/theme-editor.php (modified) (1 diff)
• wp-includes/class-wp-theme.php (modified) (1 diff)

trunk/wp-admin/theme-editor.php

@@ -214 +214 @@
 
         <div>
-        <?php if ( is_child_theme() && ! $theme->is_child_theme() && $theme->get_template() == get_template() ) : ?>
+        <?php if ( is_child_theme() && $theme->get_stylesheet() == get_template() ) : ?>
             <p><?php if ( is_writeable( $file ) ) { ?><strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
             <?php _e( 'This is a file in your current parent theme.' ); ?></p>

trunk/wp-includes/class-wp-theme.php

@@ -746 +746 @@
 
     /**
-     * Whether a theme is a child theme.
-     *
-     * @since 3.4.0
-     * @access public
-     *
-     * @return bool True if a theme is a child theme, false otherwise.
-     */
-    public function is_child_theme() {
-        return $this->template !== $this->stylesheet;
-    }
-
-    /**
      * Returns the absolute path to the directory of a theme's "stylesheet" files.
      *