Changeset 20040

Timestamp:

02/29/2012 08:07:22 PM (13 years ago)

Author:

nacin

Message:

Deprecate get_current_theme(). Use (string) wp_get_theme() to get the translated name of the theme. Keep the current_theme option for now. see #20103, see #20138.

Location:

trunk/wp-includes

Files:

• deprecated.php (modified) (3 diffs)
• theme.php (modified) (3 diffs)

trunk/wp-includes/deprecated.php

@@ -2917 +2917 @@
  *
  * @since 1.5.0
- * @global array $wp_themes Stores the working themes.
+ * @deprecated 3.4.0
+ * @deprecated Use wp_get_themes()
+ * @see wp_get_themes()
  *
  * @return array Theme list with theme data.
@@ -2942 +2944 @@
  *
  * @since 1.5.0
+ * @deprecated 3.4.0
+ * @deprecated Use wp_get_theme()
+ * @see wp_get_theme()
  *
  * @param string $theme Theme name.
@@ -2951 +2956 @@
     $themes = get_themes();
     if ( is_array( $themes ) && array_key_exists( $theme, $themes ) )
-        return $themes[$theme];
+        return $themes[ $theme ];
     return null;
 }
+
+/**
+ * Retrieve current theme name.
+ *
+ * @since 1.5.0
+ * @deprecated 3.4.0
+ * @deprecated Use (string) wp_get_theme()
+ * @see wp_get_theme()
+ *
+ * @return string
+ */
+function get_current_theme() {
+    _deprecated_function( __FUNCTION__, '3.4', 'get_current_theme()' );
+
+    if ( $theme = get_option( 'current_theme' ) )
+        return $theme;
+
+    return wp_get_theme()->get('Name');
+}

trunk/wp-includes/theme.php

@@ -355 +355 @@
     }
     return $theme_roots;
-}
-
-/**
- * Retrieve current theme display name.
- *
- * If the 'current_theme' option has already been set, then it will be returned
- * instead. If it is not set, then each theme will be iterated over until both
- * the current stylesheet and current template name.
- *
- * @since 1.5.0
- *
- * @return string
- */
-function get_current_theme() {
-    if ( $theme = get_option( 'current_theme' ) )
-        return $theme;
-
-    return wp_get_theme()->get('Name');
 }
 
@@ -792 +774 @@
     $theme_slug = get_option( 'stylesheet' );
     if ( false === ( $mods = get_option( "theme_mods_$theme_slug" ) ) ) {
-        $theme_name = get_current_theme();
+        $theme_name = get_option( 'current_theme' );
+        if ( false === $theme_name )
+            $theme_name = wp_get_theme()->get('Name');
         $mods = get_option( "mods_$theme_name" ); // Deprecated location.
         if ( is_admin() && false !== $mods ) {
@@ -879 +863 @@
 function remove_theme_mods() {
     delete_option( 'theme_mods_' . get_option( 'stylesheet' ) );
-    delete_option( 'mods_' . get_current_theme() );
+
+    // Old style.
+    $theme_name = get_option( 'current_theme' );
+    if ( false === $theme_name )
+        $theme_name = wp_get_theme()->get('Name');
+    delete_option( 'mods_' . $theme_name );
 }