Changeset 10613 for trunk/src/bp-activity/bp-activity-admin.php

Timestamp:

02/18/2016 11:10:33 AM (9 years ago)

Author:

djpaul

Message:

Fix script/style enqueue path when using BP dev. repo. with release build of WP, and SCRIPT_DEBUG=false.

If you have a WordPress release build (that is, not the dev SVN with its src folder) with a BuddyPress dev build (with its src folder), and set SCRIPT_DEBUG=false, BuddyPress will try to load the minified versions of its CSS and JS assets. As these minified assets only exist in our release builds, this causes 404 errors in this particular set of circumstances.

Fixes #6920

File:

• trunk/src/bp-activity/bp-activity-admin.php (modified) (2 diffs)

trunk/src/bp-activity/bp-activity-admin.php

@@ -202 +202 @@
     global $bp_activity_list_table;
 
-    $bp = buddypress();
-
-    // Decide whether to load the dev version of the CSS and JavaScript.
-    $min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : 'min.';
-
+    $bp       = buddypress();
     $doaction = bp_admin_list_table_current_bulk_action();
+    $min      = bp_core_get_minified_asset_suffix();
 
     /**
@@ -309 +306 @@
 
     // Enqueue CSS and JavaScript.
-    wp_enqueue_script( 'bp_activity_admin_js', $bp->plugin_url . "bp-activity/admin/js/admin.{$min}js",   array( 'jquery', 'wp-ajax-response' ), bp_get_version(), true );
+    wp_enqueue_script( 'bp_activity_admin_js', $bp->plugin_url . "bp-activity/admin/js/admin{$min}.js",   array( 'jquery', 'wp-ajax-response' ), bp_get_version(), true );
     wp_localize_script( 'bp_activity_admin_js', 'bp_activity_admin_vars', array(
         'page' => get_current_screen()->id
     ) );
-    wp_enqueue_style( 'bp_activity_admin_css', $bp->plugin_url . "bp-activity/admin/css/admin.{$min}css", array(),                               bp_get_version()       );
+    wp_enqueue_style( 'bp_activity_admin_css', $bp->plugin_url . "bp-activity/admin/css/admin{$min}.css", array(),                               bp_get_version()       );
 
     wp_style_add_data( 'bp_activity_admin_css', 'rtl', true );