Changeset 11479

Timestamp:

01/27/2022 04:14:37 AM (3 years ago)

Author:

dd32

Message:

Theme Directory: Move the "twenty" theme check to a better place, so that get_theme_post() can be run earlier.

This unbreaks SVN use of the theme directory.

Reverts [11474].

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php (modified) (8 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php

@@ -397 +397 @@
         }
 
+        // Account for "twenty" themes, these themes have slugs that do not match the normal conventions.
+        $this->theme_slug = str_replace(
+            array( 'twenty-ten', 'twenty-eleven', 'twenty-twelve', 'twenty-thirteen', 'twenty-fourteen', 'twenty-fifteen', 'twenty-sixteen', 'twenty-seventeen', 'twenty-eighteen', 'twenty-nineteen', 'twenty-twenty-one', 'twenty-twenty-two', 'twenty-twenty-three', 'twenty-twenty-four', 'twenty-twenty-five', 'twenty-twenty-six', 'twenty-twenty-seven', 'twenty-twenty-eight', 'twenty-twenty-nine', 'twenty-thirty', 'twenty-twenty'),
+            array( 'twentyten',  'twentyeleven',  'twentytwelve',  'twentythirteen',  'twentyfourteen',  'twentyfifteen',  'twentysixteen',  'twentyseventeen',  'twentyeighteen',  'twentynineteen', 'twentytwentyone', 'twentytwentytwo', 'twentytwentythree', 'twentytwentyfour',  'twentytwentyfive', 'twentytwentysix', 'twentytwentyseven', 'twentytwentyeight', 'twentytwentynine', 'twentythirty', 'twentytwenty' ),
+            $this->theme_slug
+        );
+
         if ( ! $this->theme_name || ! $this->theme_slug ) {
             $error = __( 'The theme has no name.', 'wporg-themes' ) . ' ';
@@ -424 +431 @@
         }
 
+        // Populate the theme post.
+        if ( ! $this->theme_post ) {
+            $this->theme_post = $this->get_theme_post();
+        }
+
         // Populate author.
         if ( ! $this->author ) {
@@ -434 +446 @@
 
         // Make sure it doesn't use a slug deemed not to be used by the public.
-        // This check must be run before `get_theme_post()` to account for "twenty" themes.
         if ( $this->has_reserved_slug() ) {
             $style_errors->add(
@@ -445 +456 @@
                 )
             );
-        }
-
-        // Populate the theme post.
-        // Like it says above, the has_reserved_slug() function *must* run before this.
-        if ( ! $this->theme_post ) {
-            $this->theme_post = $this->get_theme_post();
         }
 
@@ -963 +968 @@
      */
     public function has_reserved_slug() {
-        $slug = str_replace(
-            array( 'twenty-ten', 'twenty-eleven', 'twenty-twelve', 'twenty-thirteen', 'twenty-fourteen', 'twenty-fifteen', 'twenty-sixteen', 'twenty-seventeen', 'twenty-eighteen', 'twenty-nineteen', 'twenty-twenty-one', 'twenty-twenty-two', 'twenty-twenty-three', 'twenty-twenty-four', 'twenty-twenty-five', 'twenty-twenty-six', 'twenty-twenty-seven', 'twenty-twenty-eight', 'twenty-twenty-nine', 'twenty-thirty', 'twenty-twenty'),
-            array( 'twentyten',  'twentyeleven',  'twentytwelve',  'twentythirteen',  'twentyfourteen',  'twentyfifteen',  'twentysixteen',  'twentyseventeen',  'twentyeighteen',  'twentynineteen', 'twentytwentyone', 'twentytwentytwo', 'twentytwentythree', 'twentytwentyfour',  'twentytwentyfive', 'twentytwentysix', 'twentytwentyseven', 'twentytwentyeight', 'twentytwentynine', 'twentythirty', 'twentytwenty' ),
-            $this->theme_slug
-        );
-
         $reserved_slugs = array(
             // Reserve "twenty" names for wordpressdotorg.
@@ -975 +974 @@
             'twentytwentyone', 'twentytwentytwo', 'twentytwentythree', 'twentytwentyfour', 'twentytwentyfive',
             'twentytwentysix', 'twentytwentyseven', 'twentytwentyeight', 'twentytwentynine', 'twentythirty',
+
             // Theme Showcase URL parameters.
             'browse', 'tag', 'search', 'filter', 'upload', 'commercial',
@@ -981 +981 @@
 
         // If it's not a reserved slug, they can have it.
-        if (
-            ! in_array( $slug, $reserved_slugs, true ) &&
-            ! in_array( $this->theme_slug, $reserved_slugs, true )
-        ) {
+        if ( ! in_array( $this->theme_slug, $reserved_slugs, true ) ) {
             return false;
         }
-
-        // force the slug to be correct for the twenty-x themes.
-        $this->theme_slug = $slug;
 
         // WordPress.org user is always allowed to upload reserved slugs.
@@ -997 +991 @@
 
         // Only committers uploading a default theme *update* are left to be checked for.
-        $theme_post = $this->get_theme_post();
-
         // New default themes MUST be uploaded by `wordpressdotorg` and will fail this check.
         if (
             // Updates only.
-            $theme_post &&
+            $this->theme_post &&
             // The current user is a Core Committer. [ 'user_login' => 'Trac Title', ... ]
             ! empty( $GLOBALS['committers'][ $this->author->user_login ] ) &&
             // The theme is owned by WordPress.org.
-            'wordpressdotorg' === get_user_by( 'id', $theme_post->post_author )->user_login
+            'wordpressdotorg' === get_user_by( 'id', $this->theme_post->post_author )->user_login
         ) {
             // Slug is reserved, but an update is being uploaded by a core committer.