Changeset 2352 for trunk/bp-groups.php

Timestamp:

01/19/2010 11:27:58 AM (15 years ago)

Author:

apeatling

Message:

Removing "Group News" setting since the new activity stream updates replaces this with a much more intuitive interface. Fixes #1525

File:

• trunk/bp-groups.php (modified) (12 diffs)

trunk/bp-groups.php

@@ -697 +697 @@
                     return false;
 
-                if ( !groups_edit_base_group_details( $_POST['group-id'], $_POST['group-name'], $_POST['group-desc'], $_POST['group-news'], (int)$_POST['group-notify-members'] ) ) {
+                if ( !groups_edit_base_group_details( $_POST['group-id'], $_POST['group-name'], $_POST['group-desc'], (int)$_POST['group-notify-members'] ) ) {
                     bp_core_add_message( __( 'There was an error updating group details, please try again.', 'buddypress' ), 'error' );
                 } else {
@@ -726 +726 @@
         // If the edit form has been submitted, save the edited details
         if ( isset( $_POST['save'] ) ) {
-            $enable_wire = ( isset($_POST['group-show-wire'] ) ) ? 1 : 0;
             $enable_forum = ( isset($_POST['group-show-forum'] ) ) ? 1 : 0;
             $enable_photos = ( isset($_POST['group-show-photos'] ) ) ? 1 : 0;
@@ -738 +737 @@
                 return false;
 
-            if ( !groups_edit_group_settings( $_POST['group-id'], $enable_wire, $enable_forum, $enable_photos, $photos_admin_only, $status ) ) {
+            if ( !groups_edit_group_settings( $_POST['group-id'], $enable_forum, $enable_photos, $photos_admin_only, $status ) ) {
                 bp_core_add_message( __( 'There was an error updating group settings, please try again.', 'buddypress' ), 'error' );
             } else {
@@ -1097 +1096 @@
             }
 
-            if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'name' => $_POST['group-name'], 'description' => $_POST['group-desc'], 'news' => $_POST['group-news'], 'slug' => groups_check_slug( sanitize_title($_POST['group-name']) ), 'date_created' => time() ) ) ) {
+            if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'name' => $_POST['group-name'], 'description' => $_POST['group-desc'], 'slug' => groups_check_slug( sanitize_title($_POST['group-name']) ), 'date_created' => time() ) ) ) {
                 bp_core_add_message( __( 'There was an error saving group details, please try again.', 'buddypress' ), 'error' );
                 bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step . '/' );
@@ -1108 +1107 @@
         if ( 'group-settings' == $bp->groups->current_create_step ) {
             $group_status = 'public';
-            $group_enable_wire = 1;
             $group_enable_forum = 1;
-
-            if ( !isset($_POST['group-show-wire']) )
-                $group_enable_wire = 0;
 
             if ( !isset($_POST['group-show-forum']) ) {
@@ -1128 +1123 @@
                 $group_status = 'hidden';
 
-            if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'status' => $group_status, 'enable_wire' => $group_enable_wire, 'enable_forum' => $group_enable_forum ) ) ) {
+            if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'status' => $group_status, 'enable_forum' => $group_enable_forum ) ) ) {
                 bp_core_add_message( __( 'There was an error saving group details, please try again.', 'buddypress' ), 'error' );
                 bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step . '/' );
@@ -1478 +1473 @@
      *  'name'
      *  'description'
-     *  'news'
      *  'slug'
      *  'status'
-     *  'enable_wire'
      *  'enable_forum'
      *  'date_created'
@@ -1502 +1495 @@
         $group->description = $description;
 
-    if ( isset( $news ) )
-        $group->news = $news;
-
     if ( isset( $slug ) && groups_check_slug( $slug ) )
         $group->slug = $slug;
@@ -1512 +1502 @@
             $group->status = $status;
     }
-
-    if ( isset( $enable_wire ) )
-        $group->enable_wire = $enable_wire;
-    else if ( !$group_id && !isset( $enable_wire ) )
-        $group->enable_wire = 1;
 
     if ( isset( $enable_forum ) )
@@ -1546 +1531 @@
 }
 
-function groups_edit_base_group_details( $group_id, $group_name, $group_desc, $group_news, $notify_members ) {
+function groups_edit_base_group_details( $group_id, $group_name, $group_desc, $notify_members ) {
     global $bp;
 
@@ -1555 +1540 @@
     $group->name = $group_name;
     $group->description = $group_desc;
-    $group->news = $group_news;
 
     if ( !$group->save() )
@@ -1570 +1554 @@
 }
 
-function groups_edit_group_settings( $group_id, $enable_wire, $enable_forum, $enable_photos, $photos_admin_only, $status ) {
+function groups_edit_group_settings( $group_id, $enable_forum, $enable_photos, $photos_admin_only, $status ) {
     global $bp;
 
     $group = new BP_Groups_Group( $group_id, false, false );
-    $group->enable_wire = $enable_wire;
     $group->enable_forum = $enable_forum;
     $group->enable_photos = $enable_photos;