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

Timestamp:

02/12/2010 12:48:30 PM (16 years ago)

Author:

apeatling

Message:

Moving the firstname template function into the core so that template files are not tied to functions in functions.php of the default. Remove deprecated code and added to back compat plugin.

File:

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

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

@@ -22 +22 @@
 wp_enqueue_script( 'dtheme-ajax-js', get_template_directory_uri() . '/_inc/global.js', array( 'jquery' ) );
 
-function bp_dtheme_firstname( $name = false, $echo = false ) {
-    global $bp;
-
-    if ( !$name )
-        $name = $bp->loggedin_user->fullname;
-
-    $fullname = (array)explode( ' ', $name );
-    $firstname = apply_filters( 'bp_dtheme_firstname', $fullname[0], $fullname );
-
-    if ( $echo )
-        echo $firstname;
-    else
-        return $firstname;
-}
-
+/* Add the JS needed for blog comment replies */
 function bp_dtheme_add_blog_comments_js() {
     if ( is_singular() ) wp_enqueue_script( 'comment-reply' );
@@ -42 +28 @@
 add_action( 'template_redirect', 'bp_dtheme_add_blog_comments_js' );
 
+/* HTML for outputting blog comments as defined by the WP comment API */
 function bp_dtheme_blog_comments( $comment, $args, $depth ) {
     $GLOBALS['comment'] = $comment; ?>
@@ -83 +70 @@
 }
 
+/* Filter the dropdown for selecting the page to show on front to include "Activity Stream" */
 function bp_dtheme_wp_pages_filter( $page_html ) {
     if ( 'page_on_front' != substr( $page_html, 14, 13 ) )
@@ -98 +86 @@
 add_filter( 'wp_dropdown_pages', 'bp_dtheme_wp_pages_filter' );
 
+/* Hijack the saving of page on front setting to save the activity stream setting */
 function bp_dtheme_page_on_front_update( $oldvalue, $newvalue ) {
     if ( !is_admin() || !is_site_admin() )
@@ -109 +98 @@
 add_action( 'pre_update_option_page_on_front', 'bp_dtheme_page_on_front_update', 10, 2 );
 
+/* Load the activity stream template if settings allow */
 function bp_dtheme_page_on_front_template( $template ) {
     global $wp_query;
@@ -212 +202 @@
 add_action( 'init', 'bp_dtheme_add_custom_header_support' );
 
-function bp_dtheme_remove_redundant() {
-    global $bp;
-
-    /* Remove the navigation options we do not need in this theme. */
-    bp_core_remove_subnav_item( $bp->blogs->slug, 'my-blogs' );
-    bp_core_remove_subnav_item( $bp->blogs->slug, 'recent-posts' );
-    bp_core_remove_subnav_item( $bp->blogs->slug, 'recent-comments' );
-}
-add_action( 'init', 'bp_dtheme_remove_redundant' );
-
+/* Show a notice to the user in wp-admin when the theme is activated */
 function bp_dtheme_show_notice() { ?>
     <div id="message" class="updated fade">
@@ -230 +211 @@
     <?php
 }
+if ( is_admin() && isset($_GET['activated'] ) && $pagenow == "themes.php" )
+    add_action( 'admin_notices', 'bp_dtheme_show_notice' );
 
 /* Add words that we need to use in JS to the end of the page so they can be translated and still used. */
@@ -241 +224 @@
     var bp_terms_comments = '<?php _e( "comments", "buddypress" ) ?>';
     var bp_terms_close = '<?php _e( "Close", "buddypress" ) ?>';
-    var bp_terms_mention_explain = '<?php printf( __( "%s is a unique identifier for %s that you can type into any message on this site. %s will be sent a notification and a link to your message any time you use it.", "buddypress" ), '@' . bp_get_displayed_user_username(), bp_dtheme_firstname(bp_get_displayed_user_fullname()), bp_dtheme_firstname(bp_get_displayed_user_fullname()) ); ?>';
+    var bp_terms_mention_explain = '<?php printf( __( "%s is a unique identifier for %s that you can type into any message on this site. %s will be sent a notification and a link to your message any time you use it.", "buddypress" ), '@' . bp_get_displayed_user_username(), bp_get_user_firstname(bp_get_displayed_user_fullname()), bp_get_user_firstname(bp_get_displayed_user_fullname()) ); ?>';
     </script>
 <?php
@@ -247 +230 @@
 add_action( 'wp_footer', 'bp_dtheme_js_terms' );
 
-
-/* Show a notice when the theme is activated - workaround by Ozh (http://old.nabble.com/Activation-hook-exist-for-themes--td25211004.html) */
-if ( is_admin() && isset($_GET['activated'] ) && $pagenow == "themes.php" ) {
-    add_action( 'admin_notices', 'bp_dtheme_show_notice' );
-}
-
-
 ?>