Ticket #4677: 4677.2.patch

wp-content/plugins/buddypress/bp-core/admin/bp-core-admin-settings.php

@@ -182 +182 @@
 <?php
 }
 
+/**
+ * Allow group to upload avatars field
+ *
+ * @since BuddyPress (1.6)
+ *
+ * @uses checked() To display the checked attribute
+ */
+function bp_admin_setting_callback_group_avatar_uploads() {
+?>
+        <input id="bp-disable-group-avatar-uploads" name="bp-disable-group-avatar-uploads" type="checkbox" value="1" <?php checked( !bp_disable_group_avatar_uploads( false ) ); ?> />
+        <label for="bp-disable-group-avatar-uploads"><?php _e( 'Enable Group Profile Photos', 'buddypress' ); ?></label>
+<?php
+}
+
 /** Forums Section ************************************************************/
 
 /**
@@ -284 +298 @@
                 $legacy_options = array(
                         'bp-disable-account-deletion',
                         'bp-disable-avatar-uploads',
+            'bp-disable-group-avatar-uploads',
                         'bp_disable_blogforum_comments',
                         'bp-disable-profile-sync',
                         'bp_restrict_group_creation',

wp-content/plugins/buddypress/bp-groups/bp-groups-template.php

@@ -860 +860 @@
 
                 // Bail if avatars are turned off
                 // @todo Should we maybe still filter this?
-                if ( ! buddypress()->avatar->show_avatars ) {
+        // @todo ! buddypress()->avatar->show_avatars If this is a test user profile avatars why is it here for group avatar?
+                if (  bp_disable_group_avatar_uploads() ) {
                         return false;
                 }
 

wp-content/plugins/buddypress/bp-core/bp-core-admin.php

@@ -358 +358 @@
                         // Allow subscriptions setting
                         add_settings_field( 'bp_restrict_group_creation', __( 'Group Creation',   'buddypress' ), 'bp_admin_setting_callback_group_creation',   'buddypress', 'bp_groups' );
                         register_setting  ( 'buddypress',         'bp_restrict_group_creation',   'intval'                                                                                );
+
+            // Allow avatar uploads for group
+            add_settings_field( 'bp-disable-group-avatar-uploads', __( 'Group Avatar Uploads', 'buddypress' ), 'bp_admin_setting_callback_group_avatar_uploads', 'buddypress', 'bp_groups' );
+            register_setting( 'buddypress', 'bp-disable-group-avatar-uploads', 'intval' );
                 }
 
                 /** Forums ************************************************************/

wp-content/plugins/buddypress/bp-templates/bp-legacy/buddypress-functions.php

@@ -77 +77 @@
          */
         protected function setup_actions() {
 
+        add_filter( 'bp_activity_allowed_tags', array( $this, 'set_allowed_tags_secondary_avatar' ) );
                 // Template Output
                 add_filter( 'bp_get_activity_action_pre_meta', array( $this, 'secondary_avatars' ), 10, 2 );
 
@@ -434 +435 @@
         }
 
         /**
+     * @param array $activity_allowedtags
+     * @package BuddyPress Theme
+     * @return array
+     */
+    public function set_allowed_tags_secondary_avatar($activity_allowedtags)
+    {
+        $activity_allowedtags['br'] = array();
+        return $activity_allowedtags;
+    }
+
+        /**
          * Add secondary avatar image to this activity stream's record, if supported.
          *
          * @since BuddyPress (1.7)
@@ -446 +458 @@
         function secondary_avatars( $action, $activity ) {
                 switch ( $activity->component ) {
                         case 'groups' :
+                $secondary_avatar = bp_get_activity_secondary_avatar();
+                                if ( !$secondary_avatar || ( $secondary_avatar && bp_disable_group_avatar_uploads() ) ) {
+                        $secondary_avatar = '<br>';
+                                }
+
+                $reverse_content = strrev( $action );
+                $position        = strpos( $reverse_content, 'a<' );
+                $action          = substr_replace( $action, $secondary_avatar, -$position - 2, 0 );
+
+                                break;
+
                         case 'friends' :
                                 // Only insert avatar if one exists
                                 if ( $secondary_avatar = bp_get_activity_secondary_avatar() ) {

wp-content/plugins/buddypress/bp-core/bp-core-options.php

@@ -55 +55 @@
                 // Avatar uploads
                 'bp-disable-avatar-uploads'       => false,
 
+                // Group Profile Photos
+                'bp-disable-group-avatar-uploads' => false,
+
                 // Allow users to delete their own accounts
                 'bp-disable-account-deletion'     => false,
 
@@ -551 +554 @@
          * @param bool $value Whether or not members are able to upload their own avatars.
          */
         return (bool) apply_filters( 'bp_disable_avatar_uploads', (bool) bp_get_option( 'bp-disable-avatar-uploads', $default ) );
+}
+
+/**
+ * @since BuddyPress (1.6.0)
+ *
+ * @uses bp_get_option() To get the avatar uploads option for group.
+ *
+ * @param bool $default Optional. Fallback value if not found in the database.
+ *        Default: true.
+ * @return bool True if group avatar uploads are disabled, otherwise false.
+ */
+function bp_disable_group_avatar_uploads( $default = false ) {
+
+    /**
+     * Filters whether or not members are able to upload their groups avatars.
+     *
+     * @since BuddyPress (1.6.0)
+     *
+     * @param bool $value Whether or not members are able to upload their groups avatars.
+     */
+        return (bool) apply_filters( 'bp_disable_group_avatar_uploads', (bool) bp_get_option( 'bp-disable-group-avatar-uploads', $default ) );
 }
 
 /**

wp-content/plugins/buddypress/bp-groups/bp-groups-screens.php

@@ -906 +906 @@
                 return false;
 
         // If the logged-in user doesn't have permission or if avatar uploads are disabled, then stop here
-        if ( ! bp_is_item_admin() || (int) bp_get_option( 'bp-disable-avatar-uploads' ) || ! buddypress()->avatar->show_avatars )
+        if ( ! bp_is_item_admin() || bp_disable_group_avatar_uploads() )
                 return false;
 
         $bp = buddypress();

wp-content/plugins/buddypress/bp-groups/bp-groups-loader.php

@@ -573 +573 @@
                                         'position'        => 10,
                                 ), $default_params );
 
-                                if ( ! (int) bp_get_option( 'bp-disable-avatar-uploads' ) && buddypress()->avatar->show_avatars ) {
+                                if ( !bp_disable_group_avatar_uploads() ) {
                                         $sub_nav[] = array_merge( array(
                                                 'name'        => __( 'Photo', 'buddypress' ),
                                                 'slug'        => 'group-avatar',