Changeset 10160
- Timestamp:
- 09/30/2015 11:42:33 AM (9 years ago)
- Location:
- trunk/src
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/bp-activity/bp-activity-template.php
r10110 r10160 2926 2926 * @param string $link The activity thread permalink. 2927 2927 */ 2928 2928 return apply_filters( 'bp_get_activity_thread_permalink', $link ); 2929 2929 } 2930 2930 -
trunk/src/bp-core/bp-core-admin.php
r10152 r10160 320 320 // Hide toolbar for logged out users setting 321 321 add_settings_field( 'hide-loggedout-adminbar', __( 'Toolbar', 'buddypress' ), 'bp_admin_setting_callback_admin_bar', 'buddypress', 'bp_main' ); 322 322 register_setting( 'buddypress', 'hide-loggedout-adminbar', 'intval' ); 323 323 324 324 // Only show 'switch to Toolbar' option if the user chose to retain the BuddyBar during the 1.6 upgrade 325 325 if ( (bool) bp_get_option( '_bp_force_buddybar', false ) ) { 326 326 add_settings_field( '_bp_force_buddybar', __( 'Toolbar', 'buddypress' ), 'bp_admin_setting_callback_force_buddybar', 'buddypress', 'bp_main' ); 327 327 register_setting( 'buddypress', '_bp_force_buddybar', 'bp_admin_sanitize_callback_force_buddybar' ); 328 328 } 329 329 330 330 // Allow account deletion 331 331 add_settings_field( 'bp-disable-account-deletion', __( 'Account Deletion', 'buddypress' ), 'bp_admin_setting_callback_account_deletion', 'buddypress', 'bp_main' ); 332 332 register_setting( 'buddypress', 'bp-disable-account-deletion', 'intval' ); 333 333 334 334 /** XProfile Section **************************************************/ -
trunk/src/bp-core/classes/class-bp-media-extractor.php
r10108 r10160 469 469 // Match any registered WordPress shortcodes. 470 470 if ( strpos( $richtext, '[' ) !== false ) { 471 471 preg_match_all( '/' . get_shortcode_regex() . '/s', $richtext, $matches ); 472 472 473 473 if ( ! empty( $matches[2] ) ) { -
trunk/src/bp-core/js/avatar.js
r10017 r10160 183 183 184 184 // Display it 185 185 avatarStatus.inject( '.bp-avatar-status' ); 186 186 }, 187 187 -
trunk/src/bp-core/js/cover-image.js
r10155 r10160 58 58 59 59 // Display it 60 60 coverImageUploadProgress.inject( '.bp-cover-image-status' ); 61 61 }, 62 62 -
trunk/src/bp-friends/classes/class-bp-friends-friendship.php
r10147 r10160 448 448 $bp = buddypress(); 449 449 450 450 return $wpdb->query( $wpdb->prepare( "UPDATE {$bp->friends->table_name} SET is_confirmed = 1, date_created = %s WHERE id = %d AND friend_user_id = %d", bp_core_current_time(), $friendship_id, bp_loggedin_user_id() ) ); 451 451 } 452 452 -
trunk/src/bp-groups/bp-groups-actions.php
r10148 r10160 429 429 $group_admins = groups_get_group_admins( bp_get_current_group_id() ); 430 430 431 431 if ( 1 == count( $group_admins ) && $group_admins[0]->user_id == bp_loggedin_user_id() ) { 432 432 bp_core_add_message( __( 'This group must have at least one admin', 'buddypress' ), 'error' ); 433 433 } elseif ( ! groups_leave_group( $bp->groups->current_group->id ) ) { -
trunk/src/bp-groups/bp-groups-template.php
r10158 r10160 3356 3356 3357 3357 // Stop sole admins from abandoning their group 3358 3359 3358 $group_admins = groups_get_group_admins( $group->id ); 3359 if ( ( 1 == count( $group_admins ) ) && ( bp_loggedin_user_id() === (int) $group_admins[0]->user_id ) ) { 3360 3360 return false; 3361 3361 } … … 3457 3457 * 3458 3458 * @since 1.2.6 3459 3459 * @since 2.4.0 Added $group parameter to filter args. 3460 3460 * 3461 3461 * @param string $button HTML button for joining a group. -
trunk/src/bp-templates/bp-legacy/css/twentythirteen.scss
r10155 r10160 1772 1772 1773 1773 img { 1774 1774 // this is the tiny user avatar 1775 1775 display: inline; 1776 1776 height: 20px; 1777 1777 margin-right: 0.5em; 1778 1778 width: 20px !important; // override inline style 1779 1780 1781 1779 } 1780 } 1781 } 1782 1782 } 1783 1783 … … 1960 1960 text-transform: none; 1961 1961 width: 20%; 1962 1962 } 1963 1963 } // close form 1964 1964 -
trunk/src/bp-xprofile/classes/class-bp-xprofile-field.php
r10142 r10160 384 384 385 385 // Recreate type_obj in case someone changed $this->type via a filter 386 387 386 $this->type_obj = bp_xprofile_create_field_type( $this->type ); 387 $this->type_obj->field_obj = $this; 388 388 389 389 return $this->id;
Note: See TracChangeset
for help on using the changeset viewer.