<!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][5513] trunk/bp-activity: Update activity admin edit screen to allow empty values for some fields to be saved.</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 { 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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/5513">5513</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-12-11 19:09:20 +0000 (Sun, 11 Dec 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update activity admin edit screen to allow empty values for some fields to be saved. Switch some REQUESTs to POSTs. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3834">#3834</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityadminphp">trunk/bp-activity/bp-activity-admin.php</a></li>
<li><a href="#trunkbpactivitybpactivityfiltersphp">trunk/bp-activity/bp-activity-filters.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-admin.php (5512 => 5513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-admin.php 2011-12-11 19:00:12 UTC (rev 5512)
+++ trunk/bp-activity/bp-activity-admin.php 2011-12-11 19:09:20 UTC (rev 5513)
</span><span class="lines">@@ -392,37 +392,37 @@
</span><span class="cx">
</span><span class="cx"> // Activity spam status
</span><span class="cx"> $prev_spam_status = $new_spam_status = false;
</span><del>- if ( ! empty( $_REQUEST['activity_status'] ) ) {
</del><ins>+ if ( ! empty( $_POST['activity_status'] ) ) {
</ins><span class="cx"> $prev_spam_status = $activity->is_spam;
</span><del>- $new_spam_status = ( 'spam' == $_REQUEST['activity_status'] ) ? true : false;
</del><ins>+ $new_spam_status = ( 'spam' == $_POST['activity_status'] ) ? true : false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Activity action
</span><del>- if ( ! empty( $_REQUEST['bp-activities-action'] ) )
- $activity->action = $_REQUEST['bp-activities-action'];
</del><ins>+ if ( isset( $_POST['bp-activities-action'] ) )
+ $activity->action = $_POST['bp-activities-action'];
</ins><span class="cx">
</span><span class="cx"> // Activity content
</span><del>- if ( ! empty( $_REQUEST['bp-activities-content'] ) )
- $activity->content = $_REQUEST['bp-activities-content'];
</del><ins>+ if ( isset( $_POST['bp-activities-content'] ) )
+ $activity->content = $_POST['bp-activities-content'];
</ins><span class="cx">
</span><span class="cx"> // Activity primary link
</span><del>- if ( ! empty( $_REQUEST['bp-activities-link'] ) )
- $activity->primary_link = $_REQUEST['bp-activities-link'];
</del><ins>+ if ( ! empty( $_POST['bp-activities-link'] ) )
+ $activity->primary_link = $_POST['bp-activities-link'];
</ins><span class="cx">
</span><span class="cx"> // Activity user ID
</span><del>- if ( ! empty( $_REQUEST['bp-activities-userid'] ) )
- $activity->user_id = (int) $_REQUEST['bp-activities-userid'];
</del><ins>+ if ( ! empty( $_POST['bp-activities-userid'] ) )
+ $activity->user_id = (int) $_POST['bp-activities-userid'];
</ins><span class="cx">
</span><span class="cx"> // Activity item primary ID
</span><del>- if ( ! empty( $_REQUEST['bp-activities-primaryid'] ) )
- $activity->item_id = (int) $_REQUEST['bp-activities-primaryid'];
</del><ins>+ if ( isset( $_POST['bp-activities-primaryid'] ) )
+ $activity->item_id = (int) $_POST['bp-activities-primaryid'];
</ins><span class="cx">
</span><span class="cx"> // Activity item secondary ID
</span><del>- if ( ! empty( $_REQUEST['bp-activities-secondaryid'] ) )
- $activity->secondary_item_id = (int) $_REQUEST['bp-activities-secondaryid'];
</del><ins>+ if ( isset( $_POST['bp-activities-secondaryid'] ) )
+ $activity->secondary_item_id = (int) $_POST['bp-activities-secondaryid'];
</ins><span class="cx">
</span><span class="cx"> // Activity type
</span><del>- if ( ! empty( $_REQUEST['bp-activities-type'] ) ) {
</del><ins>+ if ( ! empty( $_POST['bp-activities-type'] ) ) {
</ins><span class="cx"> $actions = array();
</span><span class="cx">
</span><span class="cx"> // Walk through the registered actions, and build an array of actions/values.
</span><span class="lines">@@ -437,18 +437,18 @@
</span><span class="cx"> unset( $actions['friends_register_activity_action'] );
</span><span class="cx">
</span><span class="cx"> // Check that the new type is a registered activity type
</span><del>- if ( in_array( $_REQUEST['bp-activities-type'], $actions ) )
- $activity->type = $_REQUEST['bp-activities-type'];
</del><ins>+ if ( in_array( $_POST['bp-activities-type'], $actions ) )
+ $activity->type = $_POST['bp-activities-type'];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Activity timestamp
</span><del>- if ( ! empty( $_REQUEST['aa'] ) && ! empty( $_REQUEST['mm'] ) && ! empty( $_REQUEST['jj'] ) && ! empty( $_REQUEST['hh'] ) && ! empty( $_REQUEST['mn'] ) && ! empty( $_REQUEST['ss'] ) ) {
- $aa = $_REQUEST['aa'];
- $mm = $_REQUEST['mm'];
- $jj = $_REQUEST['jj'];
- $hh = $_REQUEST['hh'];
- $mn = $_REQUEST['mn'];
- $ss = $_REQUEST['ss'];
</del><ins>+ if ( ! empty( $_POST['aa'] ) && ! empty( $_POST['mm'] ) && ! empty( $_POST['jj'] ) && ! empty( $_POST['hh'] ) && ! empty( $_POST['mn'] ) && ! empty( $_POST['ss'] ) ) {
+ $aa = $_POST['aa'];
+ $mm = $_POST['mm'];
+ $jj = $_POST['jj'];
+ $hh = $_POST['hh'];
+ $mn = $_POST['mn'];
+ $ss = $_POST['ss'];
</ins><span class="cx"> $aa = ( $aa <= 0 ) ? date( 'Y' ) : $aa;
</span><span class="cx"> $mm = ( $mm <= 0 ) ? date( 'n' ) : $mm;
</span><span class="cx"> $jj = ( $jj > 31 ) ? 31 : $jj;
</span><span class="lines">@@ -743,11 +743,11 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <label for="bp-activities-primaryid"><?php _e( 'Primary Item ID', 'buddypress' ); ?></label>
</span><del>- <input type="number" name="bp-activities-primaryid" id="bp-activities-primaryid" value="<?php echo esc_attr( $item->item_id ); ?>" />
</del><ins>+ <input type="number" name="bp-activities-primaryid" id="bp-activities-primaryid" value="<?php echo esc_attr( $item->item_id ); ?>" min="0" />
</ins><span class="cx"> <br />
</span><span class="cx">
</span><span class="cx"> <label for="bp-activities-secondaryid"><?php _e( 'Secondary Item ID', 'buddypress' ); ?></label>
</span><del>- <input type="number" name="bp-activities-secondaryid" id="bp-activities-secondaryid" value="<?php echo esc_attr( $item->secondary_item_id ); ?>" />
</del><ins>+ <input type="number" name="bp-activities-secondaryid" id="bp-activities-secondaryid" value="<?php echo esc_attr( $item->secondary_item_id ); ?>" min="0" />
</ins><span class="cx">
</span><span class="cx"> <p><?php _e( 'These identify the object that created this activity. For example, the fields could reference a pair of site and comment IDs.', 'buddypress' ); ?></p>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpactivitybpactivityfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-filters.php (5512 => 5513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-filters.php 2011-12-11 19:00:12 UTC (rev 5512)
+++ trunk/bp-activity/bp-activity-filters.php 2011-12-11 19:09:20 UTC (rev 5513)
</span><span class="lines">@@ -75,6 +75,8 @@
</span><span class="cx"> add_filter( 'bp_get_activity_latest_update_excerpt', 'stripslashes_deep' );
</span><span class="cx"> add_filter( 'bp_get_activity_feed_item_description', 'stripslashes_deep' );
</span><span class="cx">
</span><ins>+add_filter( 'bp_activity_primary_link_before_save', 'esc_url_raw' );
+
</ins><span class="cx"> // Apply BuddyPress defined filters
</span><span class="cx"> add_filter( 'bp_get_activity_content', 'bp_activity_make_nofollow_filter' );
</span><span class="cx"> add_filter( 'bp_get_activity_content_body', 'bp_activity_make_nofollow_filter' );
</span></span></pre>
</div>
</div>
</body>
</html>