<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][12382] branches/4.0/src/bp-groups/screens/single/admin/group-settings.php: Groups: Improved group detection when updating settings.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12382">12382</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12382","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-04-25 14:43:24 +0000 (Thu, 25 Apr 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Groups: Improved group detection when updating settings.
Merges <a href="http://buddypress.trac.wordpress.org/changeset/12381">[12381]</a> to the 4.0 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches40srcbpgroupsscreenssingleadmineditdetailsphp">branches/4.0/src/bp-groups/screens/single/admin/edit-details.php</a></li>
<li><a href="#branches40srcbpgroupsscreenssingleadmingroupsettingsphp">branches/4.0/src/bp-groups/screens/single/admin/group-settings.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches40">branches/4.0/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.0
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.0 2019-04-25 14:42:31 UTC (rev 12381)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.0 2019-04-25 14:43:24 UTC (rev 12382)
</ins><a id="branches40"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.0</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/1.5:5187,5203,5210-5216,5220,5225,5247,5635
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/2.4:10363
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:12303,12305,12307,12311-12312,12326,12334,12336,12338,12340,12345,12359,12365-12366,12369,12371,12373,12375,12377-12378
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:12303,12305,12307,12311-12312,12326,12334,12336,12338,12340,12345,12359,12365-12366,12369,12371,12373,12375,12377-12378,12381
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches40srcbpgroupsscreenssingleadmineditdetailsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/src/bp-groups/screens/single/admin/edit-details.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/src/bp-groups/screens/single/admin/edit-details.php 2019-04-25 14:42:31 UTC (rev 12381)
+++ branches/4.0/src/bp-groups/screens/single/admin/edit-details.php 2019-04-25 14:43:24 UTC (rev 12382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_POST['group-name'] ) || empty( $_POST['group-desc'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> bp_core_add_message( __( 'Groups must have a name and a description. Please try again.', 'buddypress' ), 'error' );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! groups_edit_base_group_details( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'group_id' => $_POST['group-id'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'group_id' => bp_get_current_group_id(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => $_POST['group-name'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => null, // @TODO: Add to settings pane? If yes, editable by site admin only, or allow group admins to do this?
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => $_POST['group-desc'],
</span></span></pre></div>
<a id="branches40srcbpgroupsscreenssingleadmingroupsettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/src/bp-groups/screens/single/admin/group-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/src/bp-groups/screens/single/admin/group-settings.php 2019-04-25 14:42:31 UTC (rev 12381)
+++ branches/4.0/src/bp-groups/screens/single/admin/group-settings.php 2019-04-25 14:43:24 UTC (rev 12382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,18 +40,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !check_admin_referer( 'groups_edit_group_settings' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $group_id = bp_get_current_group_id();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Save group types.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Ensure we keep types that have 'show_in_create_screen' set to false.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_types = bp_groups_get_group_type( bp_get_current_group_id(), false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_types = bp_groups_get_group_type( $group_id, false );
</ins><span class="cx" style="display: block; padding: 0 10px"> $current_types = array_intersect( bp_groups_get_group_types( array( 'show_in_create_screen' => false ) ), (array) $current_types );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['group-types'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $current_types = array_merge( $current_types, $_POST['group-types'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set group types.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_groups_set_group_type( bp_get_current_group_id(), $current_types );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp_groups_set_group_type( $group_id, $current_types );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // No group types checked, so this means we want to wipe out all group types.
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,10 +65,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $current_types = empty( $current_types ) ? '' : $current_types;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set group types.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_groups_set_group_type( bp_get_current_group_id(), $current_types );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp_groups_set_group_type( $group_id, $current_types );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !groups_edit_group_settings( $_POST['group-id'], $enable_forum, $status, $invite_status ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! groups_edit_group_settings( $group_id, $enable_forum, $status, $invite_status ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> bp_core_add_message( __( 'There was an error updating group settings. Please try again.', 'buddypress' ), 'error' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> bp_core_add_message( __( 'Group settings were successfully updated.', 'buddypress' ) );
</span></span></pre>
</div>
</div>
</body>
</html>