Ticket #31620: 31620.2.patch

src/wp-includes/theme.php

@@ -626 +626 @@
 function get_raw_theme_root( $stylesheet_or_template, $skip_cache = false ) {
         global $wp_theme_directories;
 
-        if ( count($wp_theme_directories) <= 1 )
+        $theme_dir_count = count( $wp_theme_directories );
+
+        if ( 0 === $theme_dir_count ) {
                 return '/themes';
+        }
 
+        if ( 1 === $theme_dir_count ) {
+                $theme_path = reset( $wp_theme_directories );
+                $theme_path_normalized = wp_normalize_path( $theme_path );
+                $content_path_normalized = wp_normalize_path( WP_CONTENT_DIR );
+                return strpos( $theme_path_normalized, $content_path_normalized ) === 0 ? substr( $theme_path_normalized, strlen( $content_path_normalized ) ) : $theme_path_normalized;
+        }
+
         $theme_root = false;
 
         // If requesting the root for the current theme, consult options to avoid calling get_theme_roots()

tests/phpunit/tests/media.php

@@ -583 +583 @@
                 wp_delete_attachment( $post_id );
 
                 $this->assertEquals( 'This is a comment. / Это комментарий. / Βλέπετε ένα σχόλιο.', $post->post_excerpt );
+
+                // Delete test image.
+                wp_delete_attachment( $post_id );
         }
 
 }