Changeset 13490
- Timestamp:
- 05/26/2023 04:51:42 AM (17 months ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Gruntfile.js
r13465 r13490 327 327 }, 328 328 exec: { 329 bpdefault: {330 command: 'svn export --force https://github.com/buddypress/BP-Default.git/trunk bp-themes/bp-default',331 cwd: BUILD_DIR,332 stdout: false333 },334 329 cli: { 335 330 command: 'svn export --force https://github.com/buddypress/wp-cli-buddypress.git/tags/2.0.1 cli', … … 399 394 grunt.registerTask( 'commit:blocks', ['commit', 'exec:blocks_src', 'exec:modernJS_src'] ); 400 395 grunt.registerTask( 'bp_rest', [ 'exec:rest_api', 'copy:bp_rest_components', 'copy:bp_rest_core', 'clean:bp_rest' ] ); 401 grunt.registerTask( 'build', ['commit:blocks', 'clean:all', 'copy:files', 'uglify:core', 'jsvalidate:build', 'cssmin', 'bp_rest', 'makepot', 'exec: bpdefault', 'exec:cli', 'clean:cli'] );396 grunt.registerTask( 'build', ['commit:blocks', 'clean:all', 'copy:files', 'uglify:core', 'jsvalidate:build', 'cssmin', 'bp_rest', 'makepot', 'exec:cli', 'clean:cli'] ); 402 397 grunt.registerTask( 'release', ['build'] ); 403 398 grunt.registerTask( 'move:admin:js', [ 'copy:bp_admin_modern_js', 'clean:bp_admin_modern_js' ] ); -
trunk/src/bp-activity/bp-activity-template.php
r13443 r13490 2120 2120 $template = bp_locate_template( 'activity/comment.php', false, false ); 2121 2121 2122 // Backward compatibility. In older versions of BP, the markup was 2123 // generated in the PHP instead of a template. This ensures that 2124 // older themes (which are not children of bp-default and won't 2125 // have the new template) will still work. 2126 if ( !$template ) { 2127 $template = buddypress()->plugin_dir . '/bp-themes/bp-default/activity/comment.php'; 2122 if ( ! $template ) { 2123 /** 2124 * Backward compatibility filter. 2125 * 2126 * In older versions of BP, the markup was generated in the PHP 2127 * instead of a template. This ensures that older themes (which 2128 * are not children of bp-default and won'thave the new template) 2129 * will still work. 2130 * 2131 * @since 12.0.0 2132 * 2133 * @param false $template False to inform the template wasn't found. 2134 */ 2135 $template = apply_filters( 'bp_activity_recurse_comments_template', $template ); 2128 2136 } 2129 2137 2130 load_template( $template, false ); 2138 if ( $template ) { 2139 load_template( $template, false ); 2140 } 2131 2141 2132 2142 unset( $activities_template->activity->current_comment ); -
trunk/src/bp-core/bp-core-actions.php
r13468 r13490 60 60 add_action( 'bp_loaded', 'bp_setup_widgets', 6 ); 61 61 add_action( 'bp_loaded', 'bp_register_theme_packages', 12 ); 62 add_action( 'bp_loaded', 'bp_register_theme_directory', 14 );63 62 64 63 /** -
trunk/src/bp-core/bp-core-dependency.php
r13468 r13490 478 478 479 479 /** 480 * Fire the 'bp_register_theme_directory' action.481 *482 * The main action used registering theme directories.483 *484 * @since 1.5.0485 */486 function bp_register_theme_directory() {487 488 /**489 * Fires inside the 'bp_register_theme_directory' function.490 *491 * The main action used registering theme directories.492 *493 * @since 1.7.0494 */495 do_action( 'bp_register_theme_directory' );496 }497 498 /**499 480 * Fire the 'bp_register_theme_packages' action. 500 481 * -
trunk/src/bp-core/bp-core-functions.php
r13481 r13490 1106 1106 1107 1107 return $components; 1108 }1109 1110 /**1111 * Determine whether BuddyPress should register the bp-themes directory.1112 *1113 * @since 1.9.01114 *1115 * @return bool True if bp-themes should be registered, false otherwise.1116 */1117 function bp_do_register_theme_directory() {1118 // If bp-default exists in another theme directory, bail.1119 // This ensures that the version of bp-default in the regular themes1120 // directory will always take precedence, as part of a migration away1121 // from the version packaged with BuddyPress.1122 foreach ( array_values( (array) $GLOBALS['wp_theme_directories'] ) as $directory ) {1123 if ( is_dir( $directory . '/bp-default' ) ) {1124 return false;1125 }1126 }1127 1128 // If the current theme is bp-default (or a bp-default child), BP1129 // should register its directory.1130 $register = 'bp-default' === get_stylesheet() || 'bp-default' === get_template();1131 1132 // Legacy sites continue to have the theme registered.1133 if ( empty( $register ) && ( 1 == get_site_option( '_bp_retain_bp_default' ) ) ) {1134 $register = true;1135 }1136 1137 /**1138 * Filters whether BuddyPress should register the bp-themes directory.1139 *1140 * @since 1.9.01141 *1142 * @param bool $register If bp-themes should be registered.1143 */1144 return apply_filters( 'bp_do_register_theme_directory', $register );1145 1108 } 1146 1109 -
trunk/src/bp-core/bp-core-options.php
r13481 r13490 92 92 93 93 /* Legacy *********************************************/ 94 95 // Do not register the bp-default themes directory.96 '_bp_retain_bp_default' => false,97 94 98 95 // Ignore deprecated code. -
trunk/src/bp-core/bp-core-update.php
r13481 r13490 1080 1080 */ 1081 1081 function bp_deactivation() { 1082 1083 // Force refresh theme roots.1084 delete_site_transient( 'theme_roots' );1085 1086 // Switch to WordPress's default theme if current parent or child theme1087 // depend on bp-default. This is to prevent white screens of doom.1088 if ( in_array( 'bp-default', array( get_template(), get_stylesheet() ) ) ) {1089 switch_theme( WP_DEFAULT_THEME, WP_DEFAULT_THEME );1090 update_option( 'template_root', get_raw_theme_root( WP_DEFAULT_THEME, true ) );1091 update_option( 'stylesheet_root', get_raw_theme_root( WP_DEFAULT_THEME, true ) );1092 }1093 1094 1082 /** 1095 1083 * Fires during the deactivation of BuddyPress. … … 1102 1090 1103 1091 // @deprecated as of 1.6.0 1104 do_action ( 'bp_loader_deactivate' );1092 do_action_deprecated( 'bp_loader_deactivate', array(), '1.6.0' ); 1105 1093 } 1106 1094 -
trunk/src/bp-core/deprecated/1.5.php
r13108 r13490 716 716 _deprecated_function( __FUNCTION__, '1.5', 'Moved into theme template' ); 717 717 } 718 719 /** 720 * Since BuddyPress 1.0, this generated the group settings admin/member screen. 721 * As of BuddyPress 1.5 (r4489), and because this function outputs HTML, it was moved into /bp-default/groups/single/admin.php. 722 * 723 * @deprecated 1.5 724 * @deprecated No longer used. 725 * @since 1.0.0 726 * @todo Remove in 1.4 727 * 728 * @param bool $admin_list 729 * @param bool $group 730 */ 731 function bp_group_admin_memberlist( $admin_list = false, $group = false ) { 732 global $groups_template; 733 734 _deprecated_function( __FUNCTION__, '1.5', 'No longer used. See /bp-default/groups/single/admin.php' ); 735 736 if ( empty( $group ) ) { 737 $group =& $groups_template->group; 738 } 739 740 741 if ( $admins = groups_get_group_admins( $group->id ) ) : ?> 742 743 <ul id="admins-list" class="item-list<?php if ( !empty( $admin_list ) ) : ?> single-line<?php endif; ?>"> 744 745 <?php foreach ( (array) $admins as $admin ) { ?> 746 747 <?php if ( !empty( $admin_list ) ) : ?> 748 749 <li> 750 751 <?php 752 echo bp_core_fetch_avatar( 753 array( 754 'item_id' => $admin->user_id, 755 'type' => 'thumb', 756 'width' => 30, 757 'height' => 30, 758 'alt' => sprintf( 759 /* translators: %s: member name */ 760 __( 'Profile picture of %s', 'buddypress' ), 761 bp_core_get_user_displayname( $admin->user_id ) 762 ), 763 ) 764 ); 765 ?> 766 767 <h5> 768 769 <?php echo bp_core_get_userlink( $admin->user_id ); ?> 770 771 <span class="small"> 772 <a class="button confirm admin-demote-to-member" href="<?php bp_group_member_demote_link($admin->user_id) ?>"><?php _e( 'Demote to Member', 'buddypress' ) ?></a> 773 </span> 774 </h5> 775 </li> 776 777 <?php else : ?> 778 779 <li> 780 781 <?php 782 echo bp_core_fetch_avatar( 783 array( 784 'item_id' => $admin->user_id, 785 'type' => 'thumb', 786 'alt' => sprintf( 787 /* translators: %s: member name */ 788 __( 'Profile picture of %s', 'buddypress' ), 789 bp_core_get_user_displayname( $admin->user_id ) 790 ), 791 ) 792 ); 793 ?> 794 795 <h5><?php echo bp_core_get_userlink( $admin->user_id ) ?></h5> 796 <span class="activity"> 797 <?php 798 /* translators: %s: human time diff */ 799 echo bp_core_get_last_activity( strtotime( $admin->date_modified ), __( 'joined %s', 'buddypress') ); 800 ?> 801 </span> 802 803 <?php if ( bp_is_active( 'friends' ) ) : ?> 804 805 <div class="action"> 806 807 <?php bp_add_friend_button( $admin->user_id ); ?> 808 809 </div> 810 811 <?php endif; ?> 812 813 </li> 814 815 <?php endif; 816 } ?> 817 818 </ul> 819 820 <?php else : ?> 821 822 <div id="message" class="info"> 823 <p><?php _e( 'This group has no administrators', 'buddypress' ); ?></p> 824 </div> 825 826 <?php endif; 827 } -
trunk/src/bp-core/deprecated/12.0.php
r13481 r13490 500 500 */ 501 501 return apply_filters_deprecated( 'bp_get_widget_max_count_limit', array( 50, $widget_class ), '12.0.0' ); 502 } 503 504 /** 505 * Determine whether BuddyPress should register the bp-themes directory. 506 * 507 * @since 1.9.0 508 * @deprecated 12.0.0 509 * 510 * @return bool True if bp-themes should be registered, false otherwise. 511 */ 512 function bp_do_register_theme_directory() { 513 _deprecated_function( __FUNCTION__, '12.0.0' ); 514 $register = false; 515 516 /** 517 * Filters whether BuddyPress should register the bp-themes directory. 518 * 519 * @since 1.9.0 520 * @deprecated 12.0.0 521 * 522 * @param bool $register If bp-themes should be registered. 523 */ 524 return apply_filters_deprecated( 'bp_do_register_theme_directory', array( $register ), '12.0.0' ); 525 } 526 527 /** 528 * Fire the 'bp_register_theme_directory' action. 529 * 530 * The main action used registering theme directories. 531 * 532 * @since 1.5.0 533 * @deprecated 12.0.0 534 */ 535 function bp_register_theme_directory() { 536 _deprecated_function( __FUNCTION__, '12.0.0' ); 537 /** 538 * Fires inside the 'bp_register_theme_directory' function. 539 * 540 * The main action used registering theme directories. 541 * 542 * @since 1.7.0 543 * @deprecated 12.0.0 544 */ 545 do_action_deprecated( 'bp_register_theme_directory', array(), '12.0.0' ); 502 546 } 503 547 } … … 903 947 _deprecated_function( __FUNCTION__, '12.0.0' ); 904 948 } 949 950 /** 951 * Generate the HTML for a list of group moderators. 952 * 953 * No longer used. 954 * 955 * @deprecated 12.0.0 956 * 957 * @param bool $admin_list 958 * @param bool $group 959 */ 960 function bp_group_mod_memberlist( $admin_list = false, $group = false ) { 961 global $groups_template; 962 963 if ( empty( $group ) ) { 964 $group =& $groups_template->group; 965 } 966 967 if ( $group_mods = groups_get_group_mods( $group->id ) ) { ?> 968 969 <ul id="mods-list" class="item-list<?php if ( $admin_list ) { ?> single-line<?php } ?>"> 970 971 <?php foreach ( (array) $group_mods as $mod ) { ?> 972 973 <?php if ( !empty( $admin_list ) ) { ?> 974 975 <li> 976 977 <?php 978 /* translators: %s: member name */ 979 echo bp_core_fetch_avatar( 980 array( 981 'item_id' => $mod->user_id, 982 'type' => 'thumb', 983 'width' => 30, 984 'height' => 30, 985 'alt' => sprintf( 986 /* translators: %s: member name */ 987 __( 'Profile picture of %s', 'buddypress' ), 988 bp_core_get_user_displayname( $mod->user_id ) 989 ), 990 ) 991 ); 992 ?> 993 994 <h5> 995 <?php echo bp_core_get_userlink( $mod->user_id ); ?> 996 997 <span class="small"> 998 <a href="<?php bp_group_member_promote_admin_link( array( 'user_id' => $mod->user_id ) ) ?>" class="button confirm mod-promote-to-admin"><?php _e( 'Promote to Admin', 'buddypress' ); ?></a> 999 <a class="button confirm mod-demote-to-member" href="<?php bp_group_member_demote_link($mod->user_id) ?>"><?php _e( 'Demote to Member', 'buddypress' ) ?></a> 1000 </span> 1001 </h5> 1002 </li> 1003 1004 <?php } else { ?> 1005 1006 <li> 1007 1008 <?php 1009 echo bp_core_fetch_avatar( 1010 array( 1011 'item_id' => $mod->user_id, 1012 'type' => 'thumb', 1013 'alt' => sprintf( 1014 /* translators: %s: member name */ 1015 __( 'Profile picture of %s', 'buddypress' ), 1016 bp_core_get_user_displayname( $mod->user_id ) 1017 ), 1018 ) 1019 ); 1020 ?> 1021 1022 <h5><?php echo bp_core_get_userlink( $mod->user_id ) ?></h5> 1023 1024 <span class="activity"> 1025 <?php 1026 /* translators: %s: human time diff */ 1027 echo bp_core_get_last_activity( strtotime( $mod->date_modified ), __( 'joined %s', 'buddypress') ); 1028 ?> 1029 </span> 1030 1031 <?php if ( bp_is_active( 'friends' ) ) : ?> 1032 1033 <div class="action"> 1034 <?php bp_add_friend_button( $mod->user_id ) ?> 1035 </div> 1036 1037 <?php endif; ?> 1038 1039 </li> 1040 1041 <?php } ?> 1042 <?php } ?> 1043 1044 </ul> 1045 1046 <?php } else { ?> 1047 1048 <div id="message" class="info"> 1049 <p><?php _e( 'This group has no moderators', 'buddypress' ); ?></p> 1050 </div> 1051 1052 <?php } 1053 } -
trunk/src/bp-groups/bp-groups-template.php
r13451 r13490 2567 2567 2568 2568 /** 2569 * Since BuddyPress 1.0, this generated the group settings admin/member screen.2570 * As of BuddyPress 1.5 (r4489), and because this function outputs HTML, it was moved into /bp-default/groups/single/admin.php.2571 *2572 * @deprecated 1.52573 * @deprecated No longer used.2574 * @since 1.0.02575 * @todo Remove in 1.42576 *2577 * @param bool $admin_list2578 * @param bool $group2579 */2580 function bp_group_admin_memberlist( $admin_list = false, $group = false ) {2581 global $groups_template;2582 2583 _deprecated_function( __FUNCTION__, '1.5', 'No longer used. See /bp-default/groups/single/admin.php' );2584 2585 if ( empty( $group ) ) {2586 $group =& $groups_template->group;2587 }2588 2589 2590 if ( $admins = groups_get_group_admins( $group->id ) ) : ?>2591 2592 <ul id="admins-list" class="item-list<?php if ( !empty( $admin_list ) ) : ?> single-line<?php endif; ?>">2593 2594 <?php foreach ( (array) $admins as $admin ) { ?>2595 2596 <?php if ( !empty( $admin_list ) ) : ?>2597 2598 <li>2599 2600 <?php2601 echo bp_core_fetch_avatar(2602 array(2603 'item_id' => $admin->user_id,2604 'type' => 'thumb',2605 'width' => 30,2606 'height' => 30,2607 'alt' => sprintf(2608 /* translators: %s: member name */2609 __( 'Profile picture of %s', 'buddypress' ),2610 bp_core_get_user_displayname( $admin->user_id )2611 ),2612 )2613 );2614 ?>2615 2616 <h5>2617 2618 <?php echo bp_core_get_userlink( $admin->user_id ); ?>2619 2620 <span class="small">2621 <a class="button confirm admin-demote-to-member" href="<?php bp_group_member_demote_link($admin->user_id) ?>"><?php _e( 'Demote to Member', 'buddypress' ) ?></a>2622 </span>2623 </h5>2624 </li>2625 2626 <?php else : ?>2627 2628 <li>2629 2630 <?php2631 echo bp_core_fetch_avatar(2632 array(2633 'item_id' => $admin->user_id,2634 'type' => 'thumb',2635 'alt' => sprintf(2636 /* translators: %s: member name */2637 __( 'Profile picture of %s', 'buddypress' ),2638 bp_core_get_user_displayname( $admin->user_id )2639 ),2640 )2641 );2642 ?>2643 2644 <h5><?php echo bp_core_get_userlink( $admin->user_id ) ?></h5>2645 <span class="activity">2646 <?php2647 /* translators: %s: human time diff */2648 echo bp_core_get_last_activity( strtotime( $admin->date_modified ), __( 'joined %s', 'buddypress') );2649 ?>2650 </span>2651 2652 <?php if ( bp_is_active( 'friends' ) ) : ?>2653 2654 <div class="action">2655 2656 <?php bp_add_friend_button( $admin->user_id ); ?>2657 2658 </div>2659 2660 <?php endif; ?>2661 2662 </li>2663 2664 <?php endif;2665 } ?>2666 2667 </ul>2668 2669 <?php else : ?>2670 2671 <div id="message" class="info">2672 <p><?php _e( 'This group has no administrators', 'buddypress' ); ?></p>2673 </div>2674 2675 <?php endif;2676 }2677 2678 /**2679 * Generate the HTML for a list of group moderators.2680 *2681 * No longer used.2682 *2683 * @todo Deprecate.2684 *2685 * @param bool $admin_list2686 * @param bool $group2687 */2688 function bp_group_mod_memberlist( $admin_list = false, $group = false ) {2689 global $groups_template;2690 2691 if ( empty( $group ) ) {2692 $group =& $groups_template->group;2693 }2694 2695 if ( $group_mods = groups_get_group_mods( $group->id ) ) { ?>2696 2697 <ul id="mods-list" class="item-list<?php if ( $admin_list ) { ?> single-line<?php } ?>">2698 2699 <?php foreach ( (array) $group_mods as $mod ) { ?>2700 2701 <?php if ( !empty( $admin_list ) ) { ?>2702 2703 <li>2704 2705 <?php2706 /* translators: %s: member name */2707 echo bp_core_fetch_avatar(2708 array(2709 'item_id' => $mod->user_id,2710 'type' => 'thumb',2711 'width' => 30,2712 'height' => 30,2713 'alt' => sprintf(2714 /* translators: %s: member name */2715 __( 'Profile picture of %s', 'buddypress' ),2716 bp_core_get_user_displayname( $mod->user_id )2717 ),2718 )2719 );2720 ?>2721 2722 <h5>2723 <?php echo bp_core_get_userlink( $mod->user_id ); ?>2724 2725 <span class="small">2726 <a href="<?php bp_group_member_promote_admin_link( array( 'user_id' => $mod->user_id ) ) ?>" class="button confirm mod-promote-to-admin"><?php _e( 'Promote to Admin', 'buddypress' ); ?></a>2727 <a class="button confirm mod-demote-to-member" href="<?php bp_group_member_demote_link($mod->user_id) ?>"><?php _e( 'Demote to Member', 'buddypress' ) ?></a>2728 </span>2729 </h5>2730 </li>2731 2732 <?php } else { ?>2733 2734 <li>2735 2736 <?php2737 echo bp_core_fetch_avatar(2738 array(2739 'item_id' => $mod->user_id,2740 'type' => 'thumb',2741 'alt' => sprintf(2742 /* translators: %s: member name */2743 __( 'Profile picture of %s', 'buddypress' ),2744 bp_core_get_user_displayname( $mod->user_id )2745 ),2746 )2747 );2748 ?>2749 2750 <h5><?php echo bp_core_get_userlink( $mod->user_id ) ?></h5>2751 2752 <span class="activity">2753 <?php2754 /* translators: %s: human time diff */2755 echo bp_core_get_last_activity( strtotime( $mod->date_modified ), __( 'joined %s', 'buddypress') );2756 ?>2757 </span>2758 2759 <?php if ( bp_is_active( 'friends' ) ) : ?>2760 2761 <div class="action">2762 <?php bp_add_friend_button( $mod->user_id ) ?>2763 </div>2764 2765 <?php endif; ?>2766 2767 </li>2768 2769 <?php } ?>2770 <?php } ?>2771 2772 </ul>2773 2774 <?php } else { ?>2775 2776 <div id="message" class="info">2777 <p><?php _e( 'This group has no moderators', 'buddypress' ); ?></p>2778 </div>2779 2780 <?php }2781 }2782 2783 /**2784 2569 * Determine whether a group has moderators. 2785 2570 * -
trunk/src/class-buddypress.php
r13481 r13490 540 540 $this->themes_dir = $this->plugin_dir . 'bp-templates'; 541 541 $this->themes_url = $this->plugin_url . 'bp-templates'; 542 543 // Themes (for bp-default).544 $this->old_themes_dir = $this->plugin_dir . 'bp-themes';545 $this->old_themes_url = $this->plugin_url . 'bp-themes';546 542 547 543 /** Theme Compat */ … … 850 846 'register_taxonomies', // Register taxonomies. 851 847 'register_views', // Register the views. 852 'register_theme_directory', // Register the theme directory.853 848 'register_theme_packages', // Register bundled theme packages (bp-themes). 854 849 'load_textdomain', // Load textdomain. … … 915 910 * Sites using bp-default (or a child theme of bp-default) will 916 911 * continue to have bp-themes registered as before. 912 * Since 12.0, BuddyPress is no longer including BP Default. To find it 913 * back, you need to install and activate the BP Classic plugin. 917 914 * 918 915 * @since 1.5.0 919 * 920 * @todo Move bp-default to wordpress.org/extend/themes and remove this. 916 * @deprecated 12.0.0 921 917 */ 922 918 public function register_theme_directory() { 923 if ( ! bp_do_register_theme_directory() ) { 924 return; 925 } 926 927 register_theme_directory( $this->old_themes_dir ); 919 _deprecated_function( __METHOD__, '12.0.0' ); 928 920 } 929 921
Note: See TracChangeset
for help on using the changeset viewer.