Changeset 7853

Timestamp:

11/15/2018 01:35:26 AM (7 years ago)

Author:

iandunn

Message:

WordCamp Post Type: Create DRY list of venue address post meta fields.

Location:

sites/trunk/wordcamp.org/public_html/wp-content/plugins

Files:

• wcpt/wcpt-wordcamp/wordcamp-admin.php (modified) (2 diffs)
• wcpt/wcpt-wordcamp/wordcamp-loader.php (modified) (2 diffs)
• wordcamp-reports/classes/report/class-wordcamp-details.php (modified) (2 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php

@@ -263 +263 @@
 
         /**
-         * meta_keys ()
-         *
-         * Returns post meta key
+         * Returns the names and types of post meta fields that have corresponding UI fields.
+         *
+         * For keys that don't have UI, see `get_venue_address_meta_keys()` and any similar functions.
          *
          * @param string $meta_group
@@ -450 +450 @@
 
         /**
+         * Returns the slugs of the post meta fields for the venue's address.
+         *
+         * These aren't included in `meta_keys()` because they have no corresponding UI.
+         *
+         * @return array
+         */
+        static function get_venue_address_meta_keys() {
+            return array(
+                '_venue_coordinates',
+                '_venue_city',
+                '_venue_state',
+                '_venue_country_code',
+                '_venue_country_name',
+                '_venue_zip',
+            );
+        }
+
+        /**
          * Fired during admin_print_styles
          * Adds jQuery UI

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-loader.php

@@ -333 +333 @@
 
     /**
-     * Meta field keys to publicly expose in the v2 REST API
-     *
-     * @see wcorg_json_expose_whitelisted_meta_data() in mu-plugins/wcorg-json-api.php
+     * Meta field keys that are safe to publicly expose in the v2 REST API.
+     *
+     * @see wcorg_json_expose_whitelisted_meta_data() in mu-plugins/wcorg-json-api.php.
      *
      * @return array
      */
     public static function get_public_meta_keys() {
-        return array(
+        require_once( __DIR__ . '/wordcamp-admin.php' );
+
+        $safe_fields = array(
             // Sourced from wcorg_json_expose_whitelisted_meta_data()
             'Start Date (YYYY-mm-dd)',
@@ -357 +359 @@
             'Website URL',
             'Exhibition Space Available',
-            // Additional venue data
-            '_venue_coordinates',
-            '_venue_city',
-            '_venue_state',
-            '_venue_country_code',
-            '_venue_country_name',
-            '_venue_zip',
+        );
+
+        return array_merge(
+            $safe_fields,
+            WordCamp_Admin::get_venue_address_meta_keys()
         );
     }

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/classes/report/class-wordcamp-details.php

@@ -184 +184 @@
             array_keys( WordCamp_Admin::meta_keys( 'organizer' ) ),
             array_keys( WordCamp_Admin::meta_keys( 'venue' ) ),
-            [
-                '_venue_coordinates',
-                '_venue_city',
-                '_venue_state',
-                '_venue_country_code',
-                '_venue_country_name',
-                '_venue_zip',
-            ]
+            WordCamp_Admin::get_venue_address_meta_keys()
         );
     }
@@ -294 +287 @@
         }
 
-        $meta_keys = array_merge( array_keys( WordCamp_Admin::meta_keys( 'all' ) ), [
-            '_venue_coordinates',
-            '_venue_city',
-            '_venue_state',
-            '_venue_country_code',
-            '_venue_country_name',
-            '_venue_zip',
-        ] );
+        $meta_keys = array_merge(
+            array_keys( WordCamp_Admin::meta_keys( 'all' ) ),
+            WordCamp_Admin::get_venue_address_meta_keys()
+        );
 
         return $meta_keys;