Changeset 565

Timestamp:

11/21/2008 09:01:26 PM (18 years ago)

Author:

apeatling

Message:

Modified BuddyPress member theme locations.

BuddyPress member themes now sit in /wp-content/member-themes/

Added a site admin option in Site Admin > BuddyPress to select a member theme to activate for all users.

Added a new readme explaining how to turn an existing WordPress theme into a BuddyPress enabled theme.

NOTE: This will effect all existing installations. You must move /wp-content/themes/buddypress-member/ to /wp-content/member-themes/buddypress-member/

Location:

trunk

Files:

• bp-core.php (modified) (1 diff)
• bp-core/bp-core-admin.php (modified) (2 diffs)
• bp-core/bp-core-catchuri.php (modified) (3 diffs)
• bp-messages/bp-messages-notifications.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-notifications.php (modified) (1 diff)

trunk/bp-core.php

@@ -1092 +1092 @@
 }
 
+function bp_core_get_member_themes() {
+    add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
+    $themes = get_themes();
+
+    if ( $themes ) {
+        foreach ( $themes as $name => $values ) {
+            $member_themes[] = array(
+                'name' => $name,
+                'template' => $values['Template']
+            );
+        }
+    }
+    
+    return $member_themes;
+}
+
+function bp_core_set_member_theme_root() {
+    return WP_CONTENT_DIR . "/member-themes";
+}
+
+function bp_core_set_member_theme_root_uri() {
+    return WP_CONTENT_URL . '/member-themes';
+}
+
+
 /**
  * bp_core_email_from_name_filter()

trunk/bp-core/bp-core-admin.php

@@ -17 +17 @@
     <div class="wrap">
         
-        <h2>BuddyPress Settings</h2>
+        <h2><?php _e( 'BuddyPress Settings', 'buddypress' ) ?></h2>
     
         <form action="<?php $_SERVER['PHPSELF'] ?>" method="post" id="bp-admin-form">
@@ -39 +39 @@
                 </tr>
                 <?php } ?>
+                <tr>
+                    <th scope="row"><?php _e('Select theme to use for member pages', 'buddypress') ?>:</th>
+                    <td>
+                        <select name="bp-admin[active-member-theme]" id="active-member-theme">
+                            <?php $themes = bp_core_get_member_themes() ?>
+                            <?php 
+                                if ( $themes ) { 
+                                    for ( $i = 0; $i < count($themes); $i++ ) { 
+                                        if ( $themes[$i]['template'] == get_site_option( 'active-member-theme' ) ) {
+                                            $selected = ' selected="selected"';
+                                        } else {
+                                            $selected = '';
+                                        }
+                            ?>
+                                        <option<?php echo $selected ?> value="<?php echo $themes[$i]['template'] ?>"><?php echo $themes[$i]['name'] ?></option>
+                            <?php   
+                                    }
+                                }
+                            ?>
+
+                        </select>
+                    </td>           
+                </tr>
             </tbody>
             </table>

trunk/bp-core/bp-core-catchuri.php

@@ -233 +233 @@
     global $is_member_page;
     
+    $member_theme = get_site_option('active-member-theme');
+    
+    if ( $member_theme == '' )
+        $member_theme = 'buddypress-member';
+    
     // The theme filter does not recognize any globals, where as the stylesheet filter does.
     // We have to set up the globals to use manually.
@@ -243 +248 @@
         $is_single_group = BP_Groups_Group::group_exists( $current_action, $groups_bp['groups']['table_name'] );
     
-    if ( $is_member_page )
-        $theme = 'buddypress-member';
-    else if ( $current_component == $groups_bp['groups']['slug'] && $is_single_group )
-        $theme = 'buddypress-member';
-    else
-        $theme = get_option('template');
+    if ( $is_member_page || ( $current_component == $groups_bp['groups']['slug'] && $is_single_group ) ) {
+        add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
+        add_filter( 'theme_root_uri', 'bp_core_set_member_theme_root_uri' );
+
+        return $member_theme;
+    } else {
+        return get_option('template');
+    }
     
     return $theme;
@@ -256 +263 @@
 function bp_core_force_buddypress_stylesheet() {
     global $bp, $is_single_group, $is_member_page;
-    
-    if ( $is_member_page )
-        return 'buddypress-member';
-    else if ( $bp['current_component'] == $bp['groups']['slug'] && $is_single_group )   
-        return 'buddypress-member';
-    else
+
+    $member_theme = get_site_option('active-member-theme');
+    
+    if ( $member_theme == '' )
+        $member_theme = 'buddypress-member';
+    
+    if ( $is_member_page || ( $bp['current_component'] == $bp['groups']['slug'] && $is_single_group ) ) {
+        add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
+        add_filter( 'theme_root_uri', 'bp_core_set_member_theme_root_uri' );
+        
+        return $member_theme;
+    } else {
         return get_option('stylesheet');    
+    }
 }
 add_filter( 'stylesheet', 'bp_core_force_buddypress_stylesheet' );

trunk/bp-messages/bp-messages-notifications.php

@@ -18 +18 @@
         // Set up and send the message
         $to = $ud->user_email;
-        $subject = sprintf( __( 'New message from %s', 'buddypress' ), $sender_name );
+        $subject = sprintf( __( 'New message from %s', 'buddypress' ), stripslashes($sender_name) );
 
         $message = sprintf( __( 

trunk/bp-xprofile/bp-xprofile-notifications.php

@@ -35 +35 @@
             // Set up and send the message
             $to = $ud->user_email;
-            $subject = sprintf( __( '%s posted on your wire.', 'buddypress' ), $poster_name );
+            $subject = sprintf( __( '%s posted on your wire.', 'buddypress' ), stripslashes($poster_name) );
 
 $message = sprintf( __(