Changeset 1270
- Timestamp:
- 03/27/2009 10:27:30 AM (16 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-activity.php
r1265 r1270 16 16 define ( 'BP_ACTIVITY_DB_VERSION', '1211' ); 17 17 18 define ( 'BP_ACTIVITY_SLUG', apply_filters( 'bp_activity_slug', 'activity' ) ); 18 /* Define the slug for the component */ 19 if ( !defined( 'BP_ACTIVITY_SLUG' ) ) 20 define ( 'BP_ACTIVITY_SLUG', 'activity' ); 19 21 20 22 /* How long before activity items in streams are re-cached? */ 21 define ( 'BP_ACTIVITY_CACHE_LENGTH', '6 HOURS' ); 23 if ( !defined( 'BP_ACTIVITY_CACHE_LENGTH' ) ) 24 define ( 'BP_ACTIVITY_CACHE_LENGTH', '6 HOURS' ); 22 25 23 26 require ( 'bp-activity/bp-activity-classes.php' ); -
trunk/bp-blogs.php
r1250 r1270 15 15 define ( 'BP_BLOGS_DB_VERSION', '937' ); 16 16 17 define ( 'BP_BLOGS_SLUG', apply_filters( 'bp_blogs_slug', 'blogs' ) ); 18 19 /* These will be moved into admin configurable settings */ 20 define ( 'TOTAL_RECORDED_POSTS', 150 ); 21 define ( 'TOTAL_RECORDED_COMMENTS', 500 ); 17 /* Define the slug for the component */ 18 if ( !defined( 'BP_BLOGS_SLUG' ) ) 19 define ( 'BP_BLOGS_SLUG', 'blogs' ); 20 21 /* Define the total number of posts to keep track of for each user. */ 22 if ( !defined( 'TOTAL_RECORDED_POSTS' ) ) 23 define ( 'TOTAL_RECORDED_POSTS', 150 ); 24 25 /* Define the total number of comments to keep track of for each user. */ 26 if ( !defined( 'TOTAL_RECORDED_COMMENTS' ) ) 27 define ( 'TOTAL_RECORDED_COMMENTS', 500 ); 22 28 23 29 require ( 'bp-blogs/bp-blogs-classes.php' ); -
trunk/bp-core.php
r1267 r1270 10 10 */ 11 11 12 /* Place your custom code (actions/filters) in a file called bp-custom.php and it will be loaded before anything else. */ 13 if ( file_exists( WPMU_PLUGIN_DIR . '/bp-custom.php' ) ) 14 require( WPMU_PLUGIN_DIR . '/bp-custom.php' ); 15 12 16 /* Define the current version number for checking if DB tables are up to date. */ 13 17 define( 'BP_CORE_VERSION', '1.0-RC1' ); 14 18 define( 'BP_CORE_DB_VERSION', '1030' ); 15 19 16 /* Place your custom code (actions/filters) in a file called bp-custom.php and it will be loaded before anything else. */ 17 if ( file_exists( WPMU_PLUGIN_DIR . '/bp-custom.php' ) ) 18 require( WPMU_PLUGIN_DIR . '/bp-custom.php' ); 19 20 /* Define on which blog ID BuddyPress should run */ 21 define( 'BP_ROOT_BLOG', apply_filters( 'bp_root_blog', 1 ) ); 20 /* Define on which blog ID BuddyPress should run */ 21 if ( !defined( 'BP_ROOT_BLOG' ) ) 22 define( 'BP_ROOT_BLOG', 1 ); 23 24 /* Define the user and usermeta table names, useful if you are using custom or shared tables */ 25 if ( !defined( 'CUSTOM_USER_TABLE' ) ) 26 define( 'CUSTOM_USER_TABLE', $wpdb->base_prefix . 'users' ); 27 28 if ( !defined( 'CUSTOM_USER_META_TABLE' ) ) 29 define( 'CUSTOM_USER_META_TABLE', $wpdb->base_prefix . 'usermeta' ); 22 30 23 31 /* Load the language file */ … … 31 39 require ( 'bp-core/bp-core-avatars.php' ); 32 40 require ( 'bp-core/bp-core-templatetags.php' ); 33 require ( 'bp-core/bp-core-adminbar.php' );34 41 require ( 'bp-core/bp-core-settings.php' ); 35 42 require ( 'bp-core/bp-core-widgets.php' ); … … 37 44 require ( 'bp-core/bp-core-notifications.php' ); 38 45 46 if ( !defined( 'BP_DISABLE_ADMIN_BAR') ) 47 require ( 'bp-core/bp-core-adminbar.php' ); 48 39 49 /* Define the slug for member pages and the members directory (e.g. domain.com/[members] ) */ 40 define( 'MEMBERS_SLUG', apply_filters( 'bp_members_slug', 'members' ) ); 50 if ( !defined( 'MEMBERS_SLUG' ) ) 51 define( 'MEMBERS_SLUG', 'members' ); 41 52 42 53 /* Define the slug for the register/signup page */ 43 define( 'REGISTER_SLUG', apply_filters( 'bp_register_slug', 'register' ) ); 54 if ( !defined( 'REGISTER_SLUG' ) ) 55 define( 'REGISTER_SLUG', 'register' ); 44 56 45 57 /* Define the slug for the activation page */ 46 define( 'ACTIVATION_SLUG', apply_filters( 'bp_activate_slug', 'activate' ) ); 58 if ( !defined( 'ACTIVATION_SLUG' ) ) 59 define( 'ACTIVATION_SLUG', 'activate' ); 47 60 48 61 /* Define the slug for the search page */ 49 define( 'SEARCH_SLUG', apply_filters( 'bp_search_slug', 'search' ) ); 62 if ( !defined( 'SEARCH_SLUG' ) ) 63 define( 'SEARCH_SLUG', 'search' ); 50 64 51 65 /* Define the slug for the search page */ 52 define( 'HOME_BLOG_SLUG', apply_filters( 'bp_home_blog_slug', 'blog' ) ); 66 if ( !defined( 'HOME_BLOG_SLUG' ) ) 67 define( 'HOME_BLOG_SLUG', 'blog' ); 53 68 54 69 … … 626 641 global $wpdb; 627 642 628 $sql = $wpdb->prepare( "SELECT ID FROM " . $wpdb->base_prefix . "usersWHERE user_login = %s", $username );643 $sql = $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ); 629 644 return $wpdb->get_var($sql); 630 645 } … … 643 658 global $wpdb; 644 659 645 return $wpdb->get_var( $wpdb->prepare( "SELECT ID from {$wpdb->base_prefix}usersWHERE user_login = %s", $user_login ) );660 return $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $user_login ) ); 646 661 } 647 662 … … 814 829 global $wpdb; 815 830 816 $user_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->base_prefix}usersWHERE user_login = %s", $username ) );831 $user_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) ); 817 832 return bp_core_get_userlink( $user_id, false, false, true ); 818 833 } -
trunk/bp-core/bp-core-classes.php
r1268 r1270 128 128 $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ); 129 129 130 $total_users = $wpdb->get_var( $wpdb->prepare("SELECT DISTINCT count(ID) FROM {$wpdb->base_prefix}usersWHERE spam = 0 AND deleted = 0 AND user_status = 0 ORDER BY user_registered DESC" ) );131 $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT ID as user_id, DATE_ADD( user_registered, INTERVAL " . get_option('gmt_offset') . " HOUR ) as user_registered FROM {$wpdb->base_prefix}usersWHERE spam = 0 AND deleted = 0 AND user_status = 0 ORDER BY user_registered DESC{$pag_sql}" ) );130 $total_users = $wpdb->get_var( $wpdb->prepare("SELECT DISTINCT count(ID) FROM " . CUSTOM_USER_TABLE . " WHERE spam = 0 AND deleted = 0 AND user_status = 0 ORDER BY user_registered DESC" ) ); 131 $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT ID as user_id, DATE_ADD( user_registered, INTERVAL " . get_option('gmt_offset') . " HOUR ) as user_registered FROM " . CUSTOM_USER_TABLE . " WHERE spam = 0 AND deleted = 0 AND user_status = 0 ORDER BY user_registered DESC{$pag_sql}" ) ); 132 132 133 133 return array( 'users' => $paged_users, 'total' => $total_users ); … … 140 140 $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ); 141 141 142 $total_users = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(um.user_id) FROM {$wpdb->base_prefix}usermeta um LEFT JOIN {$wpdb->base_prefix}usersu ON u.ID = um.user_id WHERE um.meta_key = 'last_activity' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 ORDER BY FROM_UNIXTIME(um.meta_value) DESC" ) );143 $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT user_id FROM {$wpdb->base_prefix}usermeta um LEFT JOIN {$wpdb->base_prefix}usersu ON u.ID = um.user_id WHERE um.meta_key = 'last_activity' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 ORDER BY FROM_UNIXTIME(um.meta_value) DESC{$pag_sql}" ) );142 $total_users = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(um.user_id) FROM " . CUSTOM_USER_META_TABLE . " um LEFT JOIN " . CUSTOM_USER_TABLE . " u ON u.ID = um.user_id WHERE um.meta_key = 'last_activity' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 ORDER BY FROM_UNIXTIME(um.meta_value) DESC" ) ); 143 $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT user_id FROM " . CUSTOM_USER_META_TABLE . " um LEFT JOIN " . CUSTOM_USER_TABLE . " u ON u.ID = um.user_id WHERE um.meta_key = 'last_activity' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 ORDER BY FROM_UNIXTIME(um.meta_value) DESC{$pag_sql}" ) ); 144 144 145 145 return array( 'users' => $paged_users, 'total' => $total_users ); … … 155 155 $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ); 156 156 157 $total_users = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(um.user_id) FROM {$wpdb->base_prefix}usermeta um LEFT JOIN {$wpdb->base_prefix}usersu ON u.ID = um.user_id WHERE um.meta_key = 'total_friend_count' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 ORDER BY CONVERT(um.meta_value, SIGNED) DESC" ) );158 $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT um.user_id FROM {$wpdb->base_prefix}usermeta um LEFT JOIN {$wpdb->base_prefix}usersu ON u.ID = um.user_id WHERE um.meta_key = 'total_friend_count' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 ORDER BY CONVERT(um.meta_value, SIGNED) DESC{$pag_sql}" ) );157 $total_users = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(um.user_id) FROM " . CUSTOM_USER_META_TABLE . " um LEFT JOIN " . CUSTOM_USER_TABLE . " u ON u.ID = um.user_id WHERE um.meta_key = 'total_friend_count' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 ORDER BY CONVERT(um.meta_value, SIGNED) DESC" ) ); 158 $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT um.user_id FROM " . CUSTOM_USER_META_TABLE . " um LEFT JOIN " . CUSTOM_USER_TABLE . " u ON u.ID = um.user_id WHERE um.meta_key = 'total_friend_count' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 ORDER BY CONVERT(um.meta_value, SIGNED) DESC{$pag_sql}" ) ); 159 159 160 160 return array( 'users' => $paged_users, 'total' => $total_users ); … … 167 167 $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ); 168 168 169 $total_users = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(um.user_id) FROM {$wpdb->base_prefix}usermeta um LEFT JOIN {$wpdb->base_prefix}usersu ON u.ID = um.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND u.ID != %d ORDER BY RAND() DESC", $bp->loggedin_user->id ) );170 $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT um.user_id FROM {$wpdb->base_prefix}usermeta um LEFT JOIN {$wpdb->base_prefix}usersu ON u.ID = um.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND u.ID != %d ORDER BY RAND(){$pag_sql}", $bp->loggedin_user->id ) );169 $total_users = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(um.user_id) FROM " . CUSTOM_USER_META_TABLE . " um LEFT JOIN " . CUSTOM_USER_TABLE . " u ON u.ID = um.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND u.ID != %d ORDER BY RAND() DESC", $bp->loggedin_user->id ) ); 170 $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT um.user_id FROM " . CUSTOM_USER_META_TABLE . " um LEFT JOIN " . CUSTOM_USER_TABLE . " u ON u.ID = um.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND u.ID != %d ORDER BY RAND(){$pag_sql}", $bp->loggedin_user->id ) ); 171 171 172 172 return array( 'users' => $paged_users, 'total' => $total_users ); … … 179 179 $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ); 180 180 181 $total_users = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(um.user_id) FROM {$wpdb->base_prefix}usermeta um LEFT JOIN {$wpdb->base_prefix}usersu ON u.ID = um.user_id WHERE um.meta_key = 'last_activity' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND DATE_ADD( FROM_UNIXTIME(um.meta_value), INTERVAL 5 MINUTE ) >= NOW() ORDER BY FROM_UNIXTIME(um.meta_value) DESC" ) );182 $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT um.user_id FROM {$wpdb->base_prefix}usermeta um LEFT JOIN {$wpdb->base_prefix}usersu ON u.ID = um.user_id WHERE um.meta_key = 'last_activity' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND DATE_ADD( FROM_UNIXTIME(um.meta_value), INTERVAL 5 MINUTE ) >= NOW() ORDER BY FROM_UNIXTIME(um.meta_value) DESC{$pag_sql}" ) );181 $total_users = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(um.user_id) FROM " . CUSTOM_USER_META_TABLE . " um LEFT JOIN " . CUSTOM_USER_TABLE . " u ON u.ID = um.user_id WHERE um.meta_key = 'last_activity' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND DATE_ADD( FROM_UNIXTIME(um.meta_value), INTERVAL 5 MINUTE ) >= NOW() ORDER BY FROM_UNIXTIME(um.meta_value) DESC" ) ); 182 $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT um.user_id FROM " . CUSTOM_USER_META_TABLE . " um LEFT JOIN " . CUSTOM_USER_TABLE . " u ON u.ID = um.user_id WHERE um.meta_key = 'last_activity' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND DATE_ADD( FROM_UNIXTIME(um.meta_value), INTERVAL 5 MINUTE ) >= NOW() ORDER BY FROM_UNIXTIME(um.meta_value) DESC{$pag_sql}" ) ); 183 183 184 184 return array( 'users' => $paged_users, 'total' => $total_users ); … … 194 194 $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ); 195 195 196 $total_users = count( $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT u.ID user_id FROM {$wpdb->base_prefix}usersu LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pf.name = %s ORDER BY pd.value ASC", BP_XPROFILE_FULLNAME_FIELD_NAME ) ) );197 $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT u.ID as user_id FROM {$wpdb->base_prefix}usersu LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pf.name = %s ORDER BY pd.value ASC{$pag_sql}", BP_XPROFILE_FULLNAME_FIELD_NAME ) );196 $total_users = count( $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT u.ID user_id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pf.name = %s ORDER BY pd.value ASC", BP_XPROFILE_FULLNAME_FIELD_NAME ) ) ); 197 $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT u.ID as user_id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pf.name = %s ORDER BY pd.value ASC{$pag_sql}", BP_XPROFILE_FULLNAME_FIELD_NAME ) ); 198 198 199 199 return array( 'users' => $paged_users, 'total' => $total_users ); … … 214 214 like_escape($letter); 215 215 216 $total_users = count( $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT u.ID user_id FROM {$wpdb->base_prefix}usersu LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pf.name = %s AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC", BP_XPROFILE_FULLNAME_FIELD_NAME ) ) );217 $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT u.ID as user_id FROM {$wpdb->base_prefix}usersu LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pf.name = %s AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC{$pag_sql}", BP_XPROFILE_FULLNAME_FIELD_NAME ) );216 $total_users = count( $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT u.ID user_id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pf.name = %s AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC", BP_XPROFILE_FULLNAME_FIELD_NAME ) ) ); 217 $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT u.ID as user_id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pf.name = %s AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC{$pag_sql}", BP_XPROFILE_FULLNAME_FIELD_NAME ) ); 218 218 219 219 return array( 'users' => $paged_users, 'total' => $total_users ); … … 231 231 like_escape($search_terms); 232 232 233 $total_users = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(u.ID) as user_id FROM {$wpdb->base_prefix}usersu LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE pd.value LIKE '$search_terms%%' ORDER BY pd.value ASC" ) );234 $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT u.ID as user_id FROM {$wpdb->base_prefix}usersu LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE pd.value LIKE '$search_terms%%' ORDER BY pd.value ASC{$pag_sql}" ) );233 $total_users = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(u.ID) as user_id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE pd.value LIKE '$search_terms%%' ORDER BY pd.value ASC" ) ); 234 $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT u.ID as user_id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE pd.value LIKE '$search_terms%%' ORDER BY pd.value ASC{$pag_sql}" ) ); 235 235 236 236 return array( 'users' => $paged_users, 'total' => $total_users ); -
trunk/bp-core/bp-core-cssjs.php
r1209 r1270 58 58 */ 59 59 function bp_core_admin_bar_css() { 60 if ( defined( 'BP_DISABLE_ADMIN_BAR') ) 61 return false; 62 60 63 if ( is_user_logged_in() || ( (int)get_site_option( 'show-loggedout-adminbar' ) && !is_user_logged_in() ) ) { 61 64 wp_enqueue_style( 'bp-admin-bar', WPMU_PLUGIN_URL . '/bp-core/css/admin-bar.css' ); … … 110 113 */ 111 114 function bp_core_add_admin_css() { 115 if ( defined( 'BP_DISABLE_ADMIN_BAR') ) 116 return false; 117 112 118 wp_enqueue_style( 'bp-admin-bar', WPMU_PLUGIN_URL . '/bp-core/css/admin-bar.css' ); 113 119 } -
trunk/bp-forums.php
r1262 r1270 19 19 20 20 define ( 'BP_FORUMS_VERSION', '1.0-RC1' ); 21 define ( 'BP_FORUMS_PARENT_FORUM_ID', apply_filters( 'bp_forums_parent_forum_id', 0 ) ); 21 22 /* Define the parent forum ID */ 23 if ( !defined( 'BP_FORUMS_PARENT_FORUM_ID' ) ) 24 define ( 'BP_FORUMS_PARENT_FORUM_ID', 1 ); 22 25 23 26 require ( 'bp-forums/bp-forums-bbpress-live.php' ); -
trunk/bp-friends.php
r1262 r1270 16 16 define ( 'BP_FRIENDS_DB_VERSION', '937' ); 17 17 18 define ( 'BP_FRIENDS_SLUG', apply_filters( 'friends_slug', 'friends' ) ); 18 /* Define the slug for the component */ 19 if ( !defined( 'BP_FRIENDS_SLUG' ) ) 20 define ( 'BP_FRIENDS_SLUG', 'friends' ); 19 21 20 22 require ( 'bp-friends/bp-friends-classes.php' ); -
trunk/bp-groups.php
r1262 r1270 16 16 define ( 'BP_GROUPS_DB_VERSION', '951' ); 17 17 18 define ( 'BP_GROUPS_SLUG', apply_filters( 'groups_slug', 'groups' ) ); 18 /* Define the slug for the component */ 19 if ( !defined( 'BP_GROUPS_SLUG' ) ) 20 define ( 'BP_GROUPS_SLUG', 'groups' ); 19 21 20 22 require ( 'bp-groups/bp-groups-classes.php' ); -
trunk/bp-messages.php
r1262 r1270 16 16 define ( 'BP_MESSAGES_DB_VERSION', '948' ); 17 17 18 define ( 'BP_MESSAGES_SLUG', apply_filters( 'messages_slug', 'messages' ) ); 18 /* Define the slug for the component */ 19 if ( !defined( 'BP_MESSAGES_SLUG' ) ) 20 define ( 'BP_MESSAGES_SLUG', 'messages' ); 19 21 20 22 require ( 'bp-messages/bp-messages-classes.php' ); -
trunk/bp-wire.php
r1250 r1270 15 15 define ( 'BP_WIRE_VERSION', '1.0-RC1' ); 16 16 17 define ( 'BP_WIRE_SLUG', apply_filters( 'bp_wire_slug', 'wire' ) ); 17 /* Define the slug for the component */ 18 if ( !defined( 'BP_WIRE_SLUG' ) ) 19 define ( 'BP_WIRE_SLUG', 'wire' ); 18 20 19 21 require ( 'bp-wire/bp-wire-classes.php' ); -
trunk/bp-xprofile.php
r1262 r1270 16 16 define ( 'BP_XPROFILE_DB_VERSION', '948' ); 17 17 18 define ( 'BP_XPROFILE_SLUG', apply_filters( 'xprofile_slug', 'profile' ) ); 18 /* Define the slug for the component */ 19 if ( !defined( 'BP_XPROFILE_SLUG' ) ) 20 define ( 'BP_XPROFILE_SLUG', 'profile' ); 19 21 20 22 require ( 'bp-xprofile/bp-xprofile-classes.php' );
Note: See TracChangeset
for help on using the changeset viewer.