Changeset 1321

Timestamp:

02/25/2015 03:23:28 PM (10 years ago)

Author:

obenland

Message:

WP.org Themes: Continue with the misspelling, to avoid future confusion.

See #745.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory

Files:

• class-wporg-themes-repo-package.php (modified) (1 diff)
• class-wporg-themes-upload.php (modified) (4 diffs)
• theme-directory.php (modified) (1 diff)

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

@@ -14 +14 @@
      * @return string
      */
-    public function screen_shot_url() {
+    public function screenshot_url() {
         $screen  = 'screenshot.png';
         $version = $this->latest_version();
 
-        if ( ! empty( $this->wp_post->_screen_shot[ $version ] ) ) {
-            $screen = $this->wp_post->_screen_shot[ $version ];
+        if ( ! empty( $this->wp_post->_screenshot[ $version ] ) ) {
+            $screen = $this->wp_post->_screenshot[ $version ];
         }
 

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

@@ -112 +112 @@
 
         // We need a screen shot. People love screen shots.
-        if ( ! $this->has_screen_shot( $theme_files ) ) {
+        if ( ! $this->has_screenshot( $theme_files ) ) {
             return sprintf( __( 'The zip file must include a file named %1$s or %2$s.', 'wporg-themes' ), '<code>screenshot.png</code>', '<code>screenshot.jpg</code>' );
         }
@@ -302 +302 @@
      * @return bool
      */
-    public function has_screen_shot( $theme_files ) {
-        $screen_shots = preg_grep( '/screenshot.(jpg|jpeg|png|gif)/', $theme_files );
-        usort( $screen_shots, array( $this, 'sort_by_string_length' ) );
-
-        $this->theme->screen_shot = array_pop( $screen_shots );
-
-        return (bool) $this->theme->screen_shot;
+    public function has_screenshot( $theme_files ) {
+        $screenshots = preg_grep( '/screenshot.(jpg|jpeg|png|gif)/', $theme_files );
+        usort( $screenshots, array( $this, 'sort_by_string_length' ) );
+
+        $this->theme->screenshot = array_pop( $screenshots );
+
+        return (bool) $this->theme->screenshot;
     }
 
@@ -452 +452 @@
 [[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->screen_shot}, width=640)]]
+[[Image(https://themes.svn.wordpress.org/{$this->theme->get_stylesheet()}/{$this->theme->display( 'Version' )}/{$this->theme->screenshot}, width=640)]]
 TICKET;
     }
@@ -535 +535 @@
             '_upload_date' => $upload_date,
             '_ticket_id'   => $ticket_id,
-            '_screen_shot' => $this->theme->screen_shot,
+            '_screenshot'  => $this->theme->screenshot,
         );
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php

@@ -271 +271 @@
     if ( 'repopackage' == $post->post_type ) {
         $theme = new WPORG_Themes_Repo_Package( $post );
-        $src   = add_query_arg( array( 'w' => $size, 'strip' => 'all' ), $theme->screen_shot_url() );
+        $src   = add_query_arg( array( 'w' => $size, 'strip' => 'all' ), $theme->screenshot_url() );
 
         $html = '<img src="' . esc_url( $src ) . '"/>';