Changeset 3742 for trunk/bp-themes/bp-default/functions.php

Timestamp:

01/19/2011 08:31:10 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Adjust internal action load orders to stop 'doing it wrong' by moving appropriate actions off plugins_loaded and into init. Fixes #2609 but will need testing; it may have adverse effects on external plugins. Adds missing function_exists checks to bp-default functions.

File:

• trunk/bp-themes/bp-default/functions.php (modified) (14 diffs)

trunk/bp-themes/bp-default/functions.php

@@ -117 +117 @@
 endif;
 
-/**
- * Enqueue theme javascript safely after the 'init' action, per WordPress Codex.
+if ( !function_exists( 'bp_dtheme_enqueue_scripts' ) ) :
+/**
+ * Enqueue theme javascript safely
  *
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -146 +147 @@
 }
 add_action( 'wp_enqueue_scripts', 'bp_dtheme_enqueue_scripts' );
+endif;
 
 if ( !function_exists( 'bp_dtheme_admin_header_style' ) ) :
@@ -289 +291 @@
 endif;
 
+if ( !function_exists( 'bp_dtheme_widgets_init' ) ) :
 /**
  * Register widgetised areas, including one sidebar and four widget-ready columns in the footer.
@@ -355 +358 @@
 }
 add_action( 'widgets_init', 'bp_dtheme_widgets_init' );
+endif;
 
 if ( !function_exists( 'bp_dtheme_blog_comments' ) ) :
@@ -425 +429 @@
 endif;
 
+if ( !function_exists( 'bp_dtheme_page_on_front' ) ) :
 /**
  * Return the ID of a page set as the home page.
@@ -437 +442 @@
     return apply_filters( 'bp_dtheme_page_on_front', get_option( 'page_on_front' ) );
 }
-
+endif;
+
+if ( !function_exists( 'bp_dtheme_activity_secondary_avatars' ) ) :
 /**
  * Add secondary avatar image to this activity stream's record, if supported.
@@ -463 +470 @@
 }
 add_filter( 'bp_get_activity_action_pre_meta', 'bp_dtheme_activity_secondary_avatars', 10, 2 );
-
+endif;
+
+if ( !function_exists( 'bp_dtheme_show_notice' ) ) :
 /**
  * Show a notice when the theme is activated - workaround by Ozh (http://old.nabble.com/Activation-hook-exist-for-themes--td25211004.html)
@@ -479 +488 @@
 if ( is_admin() && isset($_GET['activated'] ) && $pagenow == "themes.php" )
     add_action( 'admin_notices', 'bp_dtheme_show_notice' );
+endif;
 
 if ( !function_exists( 'bp_dtheme_main_nav' ) ) :
@@ -516 +526 @@
 endif;
 
+if ( !function_exists( 'bp_dtheme_page_menu_args' ) ) :
 /**
  * Get our wp_nav_menu() fallback, bp_dtheme_main_nav(), to show a home link.
@@ -528 +539 @@
 }
 add_filter( 'wp_page_menu_args', 'bp_dtheme_page_menu_args' );
-
+endif;
+
+if ( !function_exists( 'bp_dtheme_comment_form' ) ) :
 /**
  * Applies BuddyPress customisations to the post comment form.
@@ -564 +577 @@
 }
 add_filter( 'comment_form_defaults', 'bp_dtheme_comment_form', 10 );
-
+endif;
+
+if ( !function_exists( 'bp_dtheme_before_comment_form' ) ) :
 /**
  * Adds the user's avatar before the comment form box.
@@ -592 +607 @@
 }
 add_action( 'comment_form_top', 'bp_dtheme_before_comment_form' );
-
+endif;
+
+if ( !function_exists( 'bp_dtheme_after_comment_form' ) ) :
 /**
  * Closes tags opened in bp_dtheme_before_comment_form().
@@ -602 +619 @@
 function bp_dtheme_after_comment_form() {
 ?>
+
     </div><!-- .comment-content standard-form -->
+
 <?php
 }
 add_action( 'comment_form', 'bp_dtheme_after_comment_form' );
-
+endif;
 
 // Everything beyond this point is deprecated as of BuddyPress 1.3. This will be removed in a future version.
+
+if ( BP_VERSION < 1.3 ) :
 
 /**
@@ -701 +722 @@
         wp_enqueue_script( 'comment-reply' );
 }
+endif;
+
 ?>