<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2359] trunk:
Fixes #1591 - accessing non-existent profile field groups.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2359</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-19 15:34:06 +0000 (Tue, 19 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1591 - accessing non-existent profile field groups.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpxprofilebpxprofileclassesphp">trunk/bp-xprofile/bp-xprofile-classes.php</a></li>
<li><a href="#trunkbpxprofilephp">trunk/bp-xprofile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-classes.php (2358 => 2359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-classes.php 2010-01-19 15:21:30 UTC (rev 2358)
+++ trunk/bp-xprofile/bp-xprofile-classes.php 2010-01-19 15:34:06 UTC (rev 2359)
</span><span class="lines">@@ -11,22 +11,22 @@
</span><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><span class="cx"> if ( $id ) {
</span><del>- $this->populate($id);
</del><ins>+ $this->populate( $id );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function populate( $id ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- $sql = $wpdb->prepare("SELECT * FROM {$bp->profile->table_name_groups} WHERE id = %d", $id);
</del><ins>+ $sql = $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_groups} WHERE id = %d", $id );
</ins><span class="cx">
</span><del>- if ( $group = $wpdb->get_row($sql) ) {
- $this->id = $group->id;
- $this->name = $group->name;
- $this->description = $group->description;
- $this->can_delete = $group->can_delete;
- }
</del><ins>+ if ( !$group = $wpdb->get_row($sql) )
+ return false;
</ins><span class="cx">
</span><ins>+ $this->id = $group->id;
+ $this->name = $group->name;
+ $this->description = $group->description;
+ $this->can_delete = $group->can_delete;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function save() {
</span></span></pre></div>
<a id="trunkbpxprofilephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile.php (2358 => 2359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile.php 2010-01-19 15:21:30 UTC (rev 2358)
+++ trunk/bp-xprofile.php 2010-01-19 15:34:06 UTC (rev 2359)
</span><span class="lines">@@ -275,11 +275,19 @@
</span><span class="cx"> function xprofile_screen_edit_profile() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !bp_is_home() && !is_site_admin() )
</del><ins>+ if ( !bp_is_my_profile() && !is_site_admin() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ /* Make sure a group is set. */
+ if ( empty( $bp->action_variables[1] ) )
+ bp_core_redirect( $bp->displayed_user->domain . BP_XPROFILE_SLUG . '/edit/group/1' );
+
+ /* Check the field group exists */
+ if ( !xprofile_get_field_group( $bp->action_variables[1] ) )
+ bp_core_redirect( $bp->root_domain );
+
</ins><span class="cx"> /* Check to see if any new information has been submitted */
</span><del>- if ( isset($_POST['field_ids']) ) {
</del><ins>+ if ( isset( $_POST['field_ids'] ) ) {
</ins><span class="cx">
</span><span class="cx"> /* Check the nonce */
</span><span class="cx"> check_admin_referer( 'bp_xprofile_edit' );
</span><span class="lines">@@ -555,7 +563,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function xprofile_get_field_group( $field_group_id ) {
</span><del>- return new BP_XProfile_Group( $field_group_id );
</del><ins>+ $field_group = new BP_XProfile_Group( $field_group_id );
+
+ if ( empty( $field_group->id ) )
+ return false;
+
+ return $field_group;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function xprofile_delete_field_group( $field_group_id ) {
</span></span></pre>
</div>
</div>
</body>
</html>