Changeset 10693

Timestamp:

04/08/2016 08:14:42 PM (9 years ago)

Author:

johnjamesjacoby

Message:

Back in r10692, a fix was slid into place
Menu_Menu_Menu all up in your face
A lot of errors busting sites but they had no taste
Some said Autoloading was wack, but now is that the case?

I have a quest to squash bugs with my hands
Without that, it's like Kryptonite and Superman
So @coffee2code deployed changes with the blip
John James my name, but on stage, call me J-trip

Fixes #7004.

Location:

trunk/src

Files:

• bp-core/bp-core-template.php (modified) (1 diff)
• bp-loader.php (modified) (1 diff)

trunk/src/bp-core/bp-core-template.php

@@ -3587 +3587 @@
     // Create custom walker if one wasn't set.
     if ( empty( $args->walker ) ) {
-
-        // Temporary fix for fatals (jjj)
-        if ( ! class_exists( 'BP_Walker_Nav_Menu' ) ) {
-            require_once dirname( __FILE__ ) . '/classes/class-bp-walker-nav-menu.php';
-        }
-
         $args->walker = new BP_Walker_Nav_Menu;
     }

trunk/src/bp-loader.php

@@ -577 +577 @@
             'BP_Walker_Category_Checklist' => 'core',
             'BP_Walker_Nav_Menu_Checklist' => 'core',
-            'BP_Walker_Nav_Menu_Menu'      => 'core',
+            'BP_Walker_Nav_Menu'           => 'core',
 
             'BP_Core_Friends_Widget' => 'friends',