Changeset 32632

Timestamp:

05/28/2015 05:50:40 AM (9 years ago)

Author:

nacin

Message:

Fix return error in get_theme_mods() from [32629].

Split a line with both an assignment and a conditional, not to mention an interpolated variable. Lots going on, easy mistake to make.

props BrianLayman.
fixes #32516.

Location:

trunk/src/wp-includes

Files:

• default-filters.php (modified) (4 diffs)
• theme.php (modified) (2 diffs)

trunk/src/wp-includes/default-filters.php

@@ -93 +93 @@
 // Format strings for display.
 foreach ( array( 'comment_author', 'term_name', 'link_name', 'link_description', 'link_notes', 'bloginfo', 'wp_title', 'widget_title' ) as $filter ) {
-    add_filter( $filter, 'wptexturize'   );
+    // add_filter( $filter, 'wptexturize'   );
     add_filter( $filter, 'convert_chars' );
     add_filter( $filter, 'esc_html'      );
@@ -105 +105 @@
 // Format titles
 foreach ( array( 'single_post_title', 'single_cat_title', 'single_tag_title', 'single_month_title', 'nav_menu_attr_title', 'nav_menu_description' ) as $filter ) {
-    add_filter( $filter, 'wptexturize' );
+    // add_filter( $filter, 'wptexturize' );
     add_filter( $filter, 'strip_tags'  );
 }
@@ -111 +111 @@
 // Format text area for display.
 foreach ( array( 'term_description' ) as $filter ) {
-    add_filter( $filter, 'wptexturize'      );
+    // add_filter( $filter, 'wptexturize'      );
     add_filter( $filter, 'convert_chars'    );
     add_filter( $filter, 'wpautop'          );
@@ -143 +143 @@
 add_filter( 'get_the_excerpt', 'wp_trim_excerpt'  );
 
-add_filter( 'comment_text', 'wptexturize'            );
+// add_filter( 'comment_text', 'wptexturize'            );
 add_filter( 'comment_text', 'convert_chars'          );
 add_filter( 'comment_text', 'make_clickable',      9 );

trunk/src/wp-includes/theme.php

@@ -901 +901 @@
 function get_theme_mods() {
     $theme_slug = get_option( 'stylesheet' );
-    if ( false === ( $mods = get_option( "theme_mods_$theme_slug" ) ) ) {
+    $mods = get_option( "theme_mods_$theme_slug" );
+    if ( false === $mods ) {
         $theme_name = get_option( 'current_theme' );
         if ( false === $theme_name )
@@ -910 +911 @@
             delete_option( "mods_$theme_name" );
         }
-        return $mods;
-    }
+    }
+    return $mods;
 }