Changeset 9318
- Timestamp:
- 01/08/2015 10:28:43 PM (10 years ago)
- Location:
- trunk/src
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/bp-activity/bp-activity-akismet.php
r9308 r9318 497 497 akismet_init(); 498 498 499 $query_string = $path = $response ='';499 $query_string = $path = ''; 500 500 501 501 $activity_data['blog'] = bp_get_option( 'home' ); -
trunk/src/bp-activity/bp-activity-filters.php
r9308 r9318 529 529 */ 530 530 function bp_activity_heartbeat_last_recorded( $response = array(), $data = array() ) { 531 $bp = buddypress();532 533 531 if ( empty( $data['bp_activity_last_recorded'] ) ) { 534 532 return $response; -
trunk/src/bp-core/bp-core-admin.php
r9014 r9318 487 487 */ 488 488 public function about_screen() { 489 global $wp_rewrite; 490 491 $is_new_install = ! empty( $_GET['is_new_install'] ); 492 $pretty_permalinks_enabled = ! empty( $wp_rewrite->permalink_structure ); 493 list( $display_version ) = explode( '-', bp_get_version() ); ?> 489 $is_new_install = ! empty( $_GET['is_new_install'] ); 490 list( $display_version ) = explode( '-', bp_get_version() ); ?> 494 491 495 492 <div class="wrap about-wrap"> -
trunk/src/bp-core/bp-core-classes.php
r9315 r9318 601 601 * @since BuddyPress (1.7.0) 602 602 * 603 * @global BuddyPress $bp Global BuddyPress settings object.604 603 * @global WPDB $wpdb Global WordPress database access object. 605 604 */ … … 625 624 // Turn user ID's into a query-usable, comma separated value 626 625 $user_ids_sql = implode( ',', wp_parse_id_list( $this->user_ids ) ); 627 628 $bp = buddypress();629 626 630 627 /** … … 2330 2327 return $output; 2331 2328 2332 $id_field = $this->db_fields['id'];2333 2329 $parent_field = $this->db_fields['parent']; 2334 2330 -
trunk/src/bp-core/bp-core-filters.php
r9315 r9318 560 560 // We use information stored in the CSS class to determine what kind of 561 561 // menu item this is, and how it should be treated 562 $css_target =preg_match( '/\sbp-(.*)-nav/', implode( ' ', $menu_item->classes), $matches );562 preg_match( '/\sbp-(.*)-nav/', implode( ' ', $menu_item->classes), $matches ); 563 563 564 564 // If this isn't a BP menu item, we can stop here -
trunk/src/bp-core/bp-core-functions.php
r9315 r9318 1913 1913 1914 1914 foreach ( $bp_menu_items as $bp_item ) { 1915 $item_name = '';1916 1915 1917 1916 // Remove <span>number</span> -
trunk/src/bp-core/bp-core-template-loader.php
r9306 r9318 443 443 */ 444 444 function bp_get_theme_compat_templates() { 445 $page_id = 0; 446 $page_template = array(); 445 $page_id = 0; 447 446 448 447 // Get the WordPress Page ID for the current view. -
trunk/src/bp-friends/bp-friends-activity.php
r9308 r9318 283 283 */ 284 284 function bp_friends_friendship_accepted_activity( $friendship_id, $initiator_user_id, $friend_user_id, $friendship = false ) { 285 286 // Bail if Activity component is not active287 285 if ( ! bp_is_active( 'activity' ) ) { 288 286 return; 289 287 } 290 291 // Get links to both members profiles292 $initiator_link = bp_core_get_userlink( $initiator_user_id );293 $friend_link = bp_core_get_userlink( $friend_user_id );294 288 295 289 // Record in activity streams for the initiator -
trunk/src/bp-members/bp-members-admin.php
r9315 r9318 218 218 */ 219 219 private function get_user_id() { 220 221 // No user ID to start 222 $user_id = 0; 220 $user_id = get_current_user_id(); 223 221 224 222 // We'll need a user ID when not on the user admin 225 223 if ( ! empty( $_GET['user_id'] ) ) { 226 224 $user_id = $_GET['user_id']; 227 228 // Assume the current user ID229 } else {230 $user_id = get_current_user_id();231 225 } 232 226 -
trunk/src/bp-members/bp-members-functions.php
r9315 r9318 597 597 */ 598 598 function bp_core_get_user_displayname( $user_id_or_username ) { 599 600 $fullname = '';601 602 599 if ( empty( $user_id_or_username ) ) { 603 600 return false; -
trunk/src/bp-messages/bp-messages-classes.php
r9315 r9318 364 364 $r = wp_parse_args( $args, $defaults ); 365 365 366 $ user_id_sql = $pag_sql = $type_sql = $search_sql = '';366 $pag_sql = $type_sql = $search_sql = ''; 367 367 368 368 if ( $r['limit'] && $r['page'] ) { -
trunk/src/bp-messages/bp-messages-notifications.php
r9308 r9318 173 173 $amount = 'multiple'; 174 174 $text = sprintf( __( 'You have %d new messages', 'buddypress' ), $total_items ); 175 $amount = 'multiple';176 175 } else { 177 176 $amount = 'single'; -
trunk/src/bp-notifications/bp-notifications-template.php
r9260 r9318 680 680 */ 681 681 function bp_get_the_notification_description() { 682 683 // Setup local variables684 $description = '';685 682 $bp = buddypress(); 686 683 $notification = $bp->notifications->query_loop->notification; -
trunk/src/bp-xprofile/bp-xprofile-cache.php
r8022 r9318 81 81 82 82 83 $bp = buddypress(); 83 $bp = buddypress(); 84 $cache = array(); 84 85 $meta_list = $wpdb->get_results( "SELECT object_id, object_type, meta_key, meta_value FROM {$bp->profile->table_name_meta} WHERE {$where_sql}" ); 85 86 86 87 if ( ! empty( $meta_list ) ) { 87 $object_type_caches = array(88 'group' => array(),89 'field' => array(),90 'data' => array(),91 );92 93 88 foreach ( $meta_list as $meta ) { 94 89 $oid = $meta->object_id;
Note: See TracChangeset
for help on using the changeset viewer.