Changeset 6877

Timestamp:

12/04/2018 06:50:43 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Engagements: demystify strategy sanitization.

This change ensures that invalid/unavailable strategies are never used, and also allows for custom strategies to exist (custom table, etc...) without requiring strategy registration.

See #3211.

Location:

trunk/src

Files:

• bbpress.php (modified) (1 diff)
• includes/core/options.php (modified) (1 diff)

trunk/src/bbpress.php

@@ -795 +795 @@
         public function setup_engagements() {
 
-                // Default (always exists)
-                $default    = "BBP_User_Engagements_Meta";
-
-                // Configured (Might not exist)
+                // Setup the class name
                 $strategy   = ucwords( bbp_engagements_strategy() );
                 $class_name = "BBP_User_Engagements_{$strategy}";
 
                 // Setup the engagements interface
-                $this->engagements = class_exists( $class_name )
-                        ? new $class_name
-                        : new $default;
+                $this->engagements = new $class_name;
         }
 

trunk/src/includes/core/options.php

@@ -732 +732 @@
         $integration = get_option( '_bbp_engagements_strategy', $default );
 
+        // Check that class exists, or fallback
+        $class_name  = 'BBP_User_Engagements_' . ucwords( $integration );
+
         // Fallback to 'meta' if invalid
-        if ( ! in_array( $integration, array( 'meta', 'user', 'term' ), true ) ) {
+        if ( ! class_exists( $class_name ) ) {
                 $integration = 'meta';
         }