Changeset 27745

Timestamp:

03/26/2014 06:21:45 PM (13 years ago)

Author:

nacin

Message:

WP_Theme: Return false from the display() method when get() fails.

Fixes a potential warning on the themes page when the active theme is deleted.

fixes #26873.

Location:

trunk

Files:

• src/wp-includes/class-wp-theme.php (modified) (2 diffs)
• tests/phpunit/tests/theme/WPTheme.php (modified) (1 diff)

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

@@ -536 +536 @@
          *
          * @param string $header Theme header. Name, Description, Author, Version, ThemeURI, AuthorURI, Status, Tags.
-         * @return string String on success, false on failure.
+         * @return string|bool String on success, false on failure.
          */
         public function get( $header ) {
@@ -572 +572 @@
          * @param bool $markup Optional. Whether to mark up the header. Defaults to true.
          * @param bool $translate Optional. Whether to translate the header. Defaults to true.
-         * @return string Processed header, false on failure.
+         * @return string|bool Processed header, false on failure.
          */
         public function display( $header, $markup = true, $translate = true ) {
                 $value = $this->get( $header );
+                if ( false === $value ) {
+                        return false;
+                }
 
                 if ( $translate && ( empty( $value ) || ! $this->load_textdomain() ) )

trunk/tests/phpunit/tests/theme/WPTheme.php

@@ -129 +129 @@
                 return 'subdir/theme with spaces';
         }
+
+        /**
+         * @ticket 26873
+         */
+        function test_display_method_on_get_method_failure() {
+                $theme = new WP_Theme( 'nonexistent', $this->theme_root );
+                $this->assertEquals( 'nonexistent', $theme->get( 'Name' ) );
+                $this->assertFalse( $theme->get( 'AuthorURI' ) );
+                $this->assertFalse( $theme->get( 'Tags' ) );
+                $this->assertFalse( $theme->display( 'Tags' ) );
+        }
 }