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

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.

File:

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

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,
         );