Changeset 4622

Timestamp:

01/10/2017 10:13:25 PM (8 years ago)

Author:

dd32

Message:

Plugin Directory: Add default meta fallback values where needed to avoid PHP warnings.

Location:

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

Files:

• api/routes/class-internal-stats.php (modified) (1 diff)
• api/routes/class-plugin.php (modified) (5 diffs)
• class-plugin-i18n.php (modified) (1 diff)
• class-template.php (modified) (5 diffs)
• cli/class-import.php (modified) (1 diff)
• shortcodes/class-screenshots.php (modified) (1 diff)
• widgets/class-ratings.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-internal-stats.php

@@ -109 +109 @@
      */
     protected function sanitize_usage_numbers( $usage, $plugin ) {
-        $latest_version = get_post_meta( $plugin->ID, 'version', true );
+        $latest_version = get_post_meta( $plugin->ID, 'version', true ) ?: '0.0';
         $latest_branch = implode( '.', array_slice( explode('.', $latest_version ), 0, 2 ) );
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin.php

@@ -60 +60 @@
         $result['name'] = $post->post_title;
         $result['slug'] = $post->post_name;
-        $result['version'] = get_post_meta( $post_id, 'version', true );
+        $result['version'] = get_post_meta( $post_id, 'version', true ) ?: '0.0';
 
         $author = get_user_by( 'id', $post->post_author );
@@ -92 +92 @@
         }
 
-        $result['requires'] = get_post_meta( $post_id, 'requires', true );
-        $result['tested'] = get_post_meta( $post_id, 'tested', true );
+        $result['requires'] = get_post_meta( $post_id, 'requires', true ) ?: false;
+        $result['tested'] = get_post_meta( $post_id, 'tested', true ) ?: false;
         $result['compatibility'] = array();
-        $result['rating'] = get_post_meta( $post_id, 'rating', true ) * 20; // Stored as 0.0 ~ 5.0, API outputs as 0..100
+        $result['rating'] = ( get_post_meta( $post_id, 'rating', true ) ?: 0 ) * 20; // Stored as 0.0 ~ 5.0, API outputs as 0..100
         $result['ratings'] = array_map( 'intval', (array) get_post_meta( $post_id, 'ratings', true ) );
         $result['num_ratings'] = array_sum( $result['ratings'] );
-        $result['support_threads'] = get_post_meta( $post_id, 'support_threads', true ) ?: 0;
-        $result['support_threads_resolved'] = get_post_meta( $post_id, 'support_threads_resolved', true ) ?: 0;
-        $result['active_installs'] = (int)get_post_meta( $post_id, 'active_installs', true );
+        $result['support_threads'] = intval( get_post_meta( $post_id, 'support_threads', true ) );
+        $result['support_threads_resolved'] = intval( get_post_meta( $post_id, 'support_threads_resolved', true ) );
+        $result['active_installs'] = intval( get_post_meta( $post_id, 'active_installs', true ) );
         $result['downloaded'] = intval( get_post_meta( $post_id, 'downloads', true ) );
         $result['last_updated'] = gmdate( 'Y-m-d g:ia \G\M\T', strtotime( $post->post_modified_gmt ) );
@@ -124 +124 @@
 
         $result['screenshots'] = array();
-        $descriptions = get_post_meta( $post->ID, 'screenshots', true );
+        $descriptions = get_post_meta( $post->ID, 'screenshots', true ) ?: array();
         $screen_shots = get_post_meta( $post->ID, 'assets_screenshots', true ) ?: array();
 
@@ -151 +151 @@
         }
 
-        $result['stable_tag'] = get_post_meta( $post_id, 'stable_tag', true );
+        $result['stable_tag'] = get_post_meta( $post_id, 'stable_tag', true ) ?: 'trunk';
 
         $result['versions'] = array();
@@ -163 +163 @@
         }
 
-        $result['donate_link'] = get_post_meta( $post_id, 'donate_link', true );
+        $result['donate_link'] = get_post_meta( $post_id, 'donate_link', true ) ?: false;
 
         $result['banners'] = array();

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-i18n.php

@@ -347 +347 @@
         $slug   = $post->post_name;
 
-        $post->stable_tag = get_post_meta( $post->ID, 'stable_tag', true );
+        $post->stable_tag = get_post_meta( $post->ID, 'stable_tag', true ) ?: 'trunk';
 
         if ( empty( $slug ) ) {

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php

@@ -20 +20 @@
     public static function active_installs( $full = true, $post = null ) {
         $post  = get_post( $post );
-        $count = get_post_meta( $post->ID, 'active_installs', true );
+        $count = get_post_meta( $post->ID, 'active_installs', true ) ?: 0;
 
         if ( $count <= 10 ) {
@@ -131 +131 @@
         }
 
-        $raw_sections = get_post_meta( $plugin->ID, 'sections', true );
+        $raw_sections = get_post_meta( $plugin->ID, 'sections', true ) ?: array();
         $raw_sections = array_unique( array_merge( $raw_sections, $default_sections ) );
 
@@ -216 +216 @@
     public static function get_plugin_icon( $post = null, $output = 'raw' ) {
         $plugin    = get_post( $post );
-        $raw_icons = get_post_meta( $plugin->ID, 'assets_icons', true );
+        $raw_icons = get_post_meta( $plugin->ID, 'assets_icons', true ) ?: array();
 
         $icon = $icon_2x = $svg = $generated = false;
@@ -295 +295 @@
 
         $banner      = $banner_2x = false;
-        $raw_banners = get_post_meta( $plugin->ID, 'assets_banners', true );
+        $raw_banners = get_post_meta( $plugin->ID, 'assets_banners', true ) ?: array();
 
         // Split in rtl and non-rtl banners.
@@ -449 +449 @@
 
         if ( 'latest' == $version || 'latest-stable' == $version ) {
-            $version = get_post_meta( $post->ID, 'stable_tag', true );
+            $version = get_post_meta( $post->ID, 'stable_tag', true ) ?: 'trunk';
         }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php

@@ -187 +187 @@
         update_post_meta( $plugin->ID, 'assets_banners_color', wp_slash( $banner_average_color ) );
 
-        $current_stable_tag = get_post_meta( $plugin->ID, 'stable_tag', true );
+        $current_stable_tag = get_post_meta( $plugin->ID, 'stable_tag', true ) ?: 'trunk';
 
         $this->rebuild_invalidate_zips( $plugin_slug, $stable_tag, $current_stable_tag, $svn_changed_tags );

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-screenshots.php

@@ -18 +18 @@
 
         // All indexed from 1.
-        $descriptions = get_post_meta( $plugin->ID, 'screenshots', true );
-        $screen_shots = get_post_meta( $plugin->ID, 'assets_screenshots', true );
+        $descriptions = get_post_meta( $plugin->ID, 'screenshots', true ) ?: array();
+        $screen_shots = get_post_meta( $plugin->ID, 'assets_screenshots', true ) ?: array();;
 
         if ( empty( $screen_shots ) ) {

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-ratings.php

@@ -30 +30 @@
 
         $post        = get_post();
-        $rating      = get_post_meta( $post->ID, 'rating', true );
+        $rating      = get_post_meta( $post->ID, 'rating', true ) ?: 0;
         $ratings     = get_post_meta( $post->ID, 'ratings', true ) ?: array();
         $num_ratings = array_sum( $ratings );