<!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] [3327] trunk/bp-themes/bp-default/_inc/ajax.php: Fix #2692,
  props calvin_42</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>3327</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2010-10-28 17:12:08 +0000 (Thu, 28 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix #2692, props calvin_42</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (3326 => 3327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php        2010-10-28 13:13:28 UTC (rev 3326)
+++ trunk/bp-themes/bp-default/_inc/ajax.php        2010-10-28 17:12:08 UTC (rev 3327)
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> function bp_dtheme_delete_activity() {
</span><span class="cx">         global $bp;
</span><span class="cx"> 
</span><del>-        /* Check the nonce */
</del><ins>+        // Check the nonce
</ins><span class="cx">         check_admin_referer( 'bp_activity_delete_link' );
</span><span class="cx"> 
</span><span class="cx">         if ( !is_user_logged_in() ) {
</span><span class="lines">@@ -213,16 +213,16 @@
</span><span class="cx">                 return false;
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        if ( empty( $_POST['id'] ) || !is_numeric( $_POST['id'] ) )
+                return false;
+
</ins><span class="cx">         $activity = new BP_Activity_Activity( $_POST['id'] );
</span><span class="cx"> 
</span><del>-        /* Check access */
</del><ins>+        // Check access
</ins><span class="cx">         if ( !is_super_admin() &amp;&amp; $activity-&gt;user_id != $bp-&gt;loggedin_user-&gt;id )
</span><span class="cx">                 return false;
</span><span class="cx"> 
</span><del>-        if ( empty( $_POST['id'] ) || !is_numeric( $_POST['id'] ) )
-                return false;
-
-        /* Call the action before the delete so plugins can still fetch information about it */
</del><ins>+        // Call the action before the delete so plugins can still fetch information about it
</ins><span class="cx">         do_action( 'bp_activity_action_delete_activity', $_POST['id'], $activity-&gt;user_id );
</span><span class="cx"> 
</span><span class="cx">         if ( !bp_activity_delete( array( 'id' =&gt; $_POST['id'], 'user_id' =&gt; $activity-&gt;user_id ) ) ) {
</span></span></pre>
</div>
</div>

</body>
</html>