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

Timestamp:

02/27/2015 06:03:24 PM (11 years ago)

Author:

Otto42

Message:

Determine proper theme-slug and use it everywhere instead of relying on WP_Theme to give it to us, because WP_Theme returns the directory name. This makes sense for WP_Theme in core, where the directory name is needed to find the theme, however here we need the sanitized version of the theme name to detemine the slug in the directory and in SVN.

File:

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

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

@@ -108 +108 @@
                 // We have a stylesheet, let's set up the theme, theme post, and author.
                 $this->theme      = new WP_Theme( basename( dirname( $style_css ) ), dirname( dirname( $style_css ) ) );
-                $this->theme_post = $this->get_theme_post();
-                $this->author     = wp_get_current_user();
 
                 // We need a screen shot. People love screen shots.
@@ -121 +119 @@
                 // Let's check some theme headers, shall we?
 
-                if ( ! $this->theme->get( 'Name' ) ) {
+                if ( ! $this->theme_name = $this->theme->get( 'Name' ) ) {
                         return __( "The theme has no name. Add it to style.css and upload the theme again. <a href='https://codex.wordpress.org/Theme_Development#Theme_Style_Sheet'>Theme Style Sheets</a>", 'wporg-themes' );
                 }
+
+                // determine the theme slug based on the name of the theme in the stylesheet
+                $this->theme_slug = sanitize_title_with_dashes( $this->theme_name );
+
+                // populate the theme post and author
+                $this->theme_post = $this->get_theme_post();
+                $this->author     = wp_get_current_user();
 
                 $theme_description = $this->strip_non_utf8( (string) $this->theme->get( 'Description' ) );
@@ -144 +149 @@
                 // Make sure we have version that is higher than any previously uploaded version of this theme.
                 if ( ! empty( $this->theme_post ) && ! version_compare( $this->theme->get( 'Version' ), $this->theme_post->max_version, '>' ) ) {
-                        return sprintf( __( 'You need to upload a version of %1$s higher than %2$s. Increase the theme version number in <code>style.css</code>, then upload your zip file again.', 'wporg-themes' ), $this->theme->display( 'Name' ), '<code>' . $this->theme->display( 'Version' ) . '</code>' );
+                        return sprintf( __( 'You need to upload a version of %1$s higher than %2$s. Increase the theme version number in <code>style.css</code>, then upload your zip file again.', 'wporg-themes' ), $this->theme->display( 'Name' ), '<code>' . $this->theme_post->max_version . '</code>' );
                 }
 
@@ -159 +164 @@
                 // Make sure it doesn't use a slug deemed not to be used by the public.
                 if ( $this->has_reserved_slug() ) {
-                        return sprintf( __( 'Sorry, the theme name %s is reserved for use by WordPress Core. Please change the name of your theme in <code>style.css</code> and upload it again.', 'wporg-themes' ), '<code>' . $this->theme->get_stylesheet() . '</code>' );
+                        return sprintf( __( 'Sorry, the theme name %s is reserved for use by WordPress Core. Please change the name of your theme in <code>style.css</code> and upload it again.', 'wporg-themes' ), '<code>' . $this->theme_slug . '</code>' );
                 }
 
                 // Is there already a theme with the name name by a different author?
                 if ( ! empty( $this->theme_post ) && $this->theme_post->post_author != $this->author->ID ) {
-                        return sprintf( __( 'There is already a theme called %s by a different author. Please change the name of your theme in <code>style.css</code> and upload it again.', 'wporg-themes' ), '<code>' . $this->theme->get_stylesheet() . '</code>' );
+                        return sprintf( __( 'There is already a theme called %s by a different author. Please change the name of your theme in <code>style.css</code> and upload it again.', 'wporg-themes' ), '<code>' . $this->theme_slug . '</code>' );
                 }
 
@@ -276 +281 @@
         public function get_theme_post() {
                 $themes = get_posts( array(
-                        'name'             => $this->theme->get_stylesheet(),
+                        'name'             => $this->theme_slug,
                         'posts_per_page'   => 1,
                         'post_type'        => 'repopackage',
@@ -345 +350 @@
                         array( 'twenty-ten', 'twenty-eleven', 'twenty-twelve', 'twenty-thirteen', 'twenty-fourteen', 'twenty-fifteen', 'twenty-sixteen', 'twenty-seventeen', 'twenty-eighteen', 'twenty-nineteen', 'twenty-twenty' ),
                         array( 'twentyten',  'twentyeleven',  'twentytwelve',  'twentythirteen',  'twentyfourteen',  'twentyfifteen',  'twentysixteen',  'twentyseventeen',  'twentyeighteen',  'twentynineteen',  'twentytwenty'  ),
-                        $this->theme->get_stylesheet()
+                        $this->theme_slug
                 );
 
@@ -403 +408 @@
                 // Keywords
                 $this->trac_ticket->keywords = array(
-                        'theme-' . $this->theme->get_stylesheet(),
+                        'theme-' . $this->theme_slug,
                 );
 
@@ -438 +443 @@
                 $this->trac_ticket->diff_line = '';
                 if ( ! empty( $this->theme_post->max_version ) ) {
-                        $this->trac_ticket->diff_line = "\n" . sprintf( __( 'Diff with previous version: %s', 'wporg-themes' ), "https://themes.trac.wordpress.org/changeset?old_path={$this->theme->get_stylesheet()}/{$this->theme_post->max_version}&new_path={$this->theme->get_stylesheet()}/{$this->theme->display( 'Version' )}\n" );
+                        $this->trac_ticket->diff_line = "\n" . sprintf( __( 'Diff with previous version: %s', 'wporg-themes' ), "https://themes.trac.wordpress.org/changeset?old_path={$this->theme_slug}/{$this->theme_post->max_version}&new_path={$this->theme_slug}/{$this->theme->display( 'Version' )}\n" );
                 }
 
@@ -450 +455 @@
 Author URL - {$this->theme->display( 'AuthorURI' )}
 
-SVN - https://themes.svn.wordpress.org/{$this->theme->get_stylesheet()}/{$this->theme->display( 'Version' )}
-ZIP - https://wordpress.org/themes/download/{$this->theme->get_stylesheet()}.{$this->theme->display( 'Version' )}.zip?nostats=1
+SVN - https://themes.svn.wordpress.org/{$this->theme_slug}/{$this->theme->display( 'Version' )}
+ZIP - https://wordpress.org/themes/download/{$this->theme_slug}.{$this->theme->display( 'Version' )}.zip?nostats=1
 {$this->trac_ticket->parent_link}
 {$this->trac_ticket->diff_line}
 History:
-[[TicketQuery(format=table, keywords=~theme-{$this->theme->get_stylesheet()}, col=id|summary|status|resolution|owner)]]
-
-[[Image(https://themes.svn.wordpress.org/{$this->theme->get_stylesheet()}/{$this->theme->display( 'Version' )}/{$this->theme->screenshot}, width=640)]]
+[[TicketQuery(format=table, keywords=~theme-{$this->theme_slug}, col=id|summary|status|resolution|owner)]]
+
+[[Image(https://themes.svn.wordpress.org/{$this->theme_slug}/{$this->theme->display( 'Version' )}/{$this->theme->screenshot}, width=640)]]
 TICKET;
         }
@@ -513 +518 @@
                         'post_author'    => $this->author->ID,
                         'post_title'     => $this->theme->get( 'Name' ),
-                        'post_name'      => $this->theme->get_stylesheet(),
+                        'post_name'      => $this->theme_slug,
                         'post_content'   => $this->theme->get( 'Description' ),
                         'post_parent'    => $this->theme->post_parent,
@@ -563 +568 @@
                 $import_msg = empty( $this->theme_post ) ?  __( 'New theme: %1$s - %2$s', 'wporg-themes' ) : __( 'New version of %1$s - %2$s', 'wporg-themes' );
                 $import_msg = escapeshellarg( sprintf( $import_msg, $this->theme->display( 'Name' ), $this->theme->display( 'Version' ) ) );
-                $svn_path   = escapeshellarg( "https://themes.svn.wordpress.org/{$this->theme->get_stylesheet()}/{$this->theme->display( 'Version' )}" );
+                $svn_path   = escapeshellarg( "https://themes.svn.wordpress.org/{$this->theme_slug}/{$this->theme->display( 'Version' )}" );
                 $theme_path = escapeshellarg( $this->theme_dir );
                 $svn        = escapeshellarg( self::SVN );