Changeset 7851 for sites/trunk/wordcamp.org/public_html/wp-content/plugins

Timestamp:

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

Author:

iandunn

Message:

WordCamp Reports: Call WordCamp_Admin::meta_keys statically for front end use.

The $wordcamp_admin global is only available in wp-admin, but a future commit will introduce a public version of this report, so we need to be able to call meta_keys() on the front end as well. Initializing WordCamp_Admin on the front end would have undesirable side-effects, but meta_keys() is already static, so we can just switch to calling it that way.

File:

• sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/classes/report/class-wordcamp-details.php (modified) (4 diffs)

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

@@ -163 +163 @@
      */
     public static function get_field_order() {
-        /* @var WordCamp_Admin $wordcamp_admin */
-        global $wordcamp_admin;
+        if ( ! is_callable( array( 'WordCamp_Admin', 'meta_keys' ) ) ) {
+            require_once( WP_PLUGIN_DIR . '/wcpt/wcpt-wordcamp/wordcamp-admin.php' );
+        }
 
         return array_merge(
@@ -171 +172 @@
                 'Name',
             ],
-            array_keys( $wordcamp_admin->meta_keys( 'wordcamp' ) ),
+            array_keys( WordCamp_Admin::meta_keys( 'wordcamp' ) ),
             [
                 'Created',
@@ -180 +181 @@
                 'Organizers',
             ],
-            array_keys( $wordcamp_admin->meta_keys( 'contributor' ) ),
-            array_keys( $wordcamp_admin->meta_keys( 'organizer' ) ),
-            array_keys( $wordcamp_admin->meta_keys( 'venue' ) ),
+            array_keys( WordCamp_Admin::meta_keys( 'contributor' ) ),
+            array_keys( WordCamp_Admin::meta_keys( 'organizer' ) ),
+            array_keys( WordCamp_Admin::meta_keys( 'venue' ) ),
             [
                 '_venue_coordinates',
@@ -289 +290 @@
      */
     public function get_meta_keys() {
-        /* @var WordCamp_Admin $wordcamp_admin */
-        global $wordcamp_admin;
-        $meta_keys = array_merge( array_keys( $wordcamp_admin->meta_keys( 'all' ) ), [
+        if ( ! is_callable( array( 'WordCamp_Admin', 'meta_keys' ) ) ) {
+            require_once( WP_PLUGIN_DIR . '/wcpt/wcpt-wordcamp/wordcamp-admin.php' );
+        }
+
+        $meta_keys = array_merge( array_keys( WordCamp_Admin::meta_keys( 'all' ) ), [
             '_venue_coordinates',
             '_venue_city',