<!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][8135] trunk: Remove unnecessary parameter sanitization from meta functions</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 { 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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8135">8135</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-03-14 01:12:13 +0000 (Fri, 14 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unnecessary parameter sanitization from meta functions
WP's meta API functions already perform the necessary sanitization.
See <a href="http://buddypress.trac.wordpress.org/ticket/5399">#5399</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityfunctionsphp">trunk/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunkbpblogsbpblogsfunctionsphp">trunk/bp-blogs/bp-blogs-functions.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsfunctionsphp">trunk/bp-groups/bp-groups-functions.php</a></li>
<li><a href="#trunkbpxprofilebpxprofilefunctionsphp">trunk/bp-xprofile/bp-xprofile-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-functions.php (8134 => 8135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-functions.php 2014-03-14 01:06:37 UTC (rev 8134)
+++ trunk/bp-activity/bp-activity-functions.php 2014-03-14 01:12:13 UTC (rev 8135)
</span><span class="lines">@@ -571,11 +571,6 @@
</span><span class="cx"> function bp_activity_delete_meta( $activity_id, $meta_key = '', $meta_value = '', $delete_all = false ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- // Legacy - Return false if any of the above values are not set
- if ( ! is_numeric( $activity_id ) ) {
- return false;
- }
-
</del><span class="cx"> // Legacy - if no meta_key is passed, delete all for the item
</span><span class="cx"> if ( empty( $meta_key ) ) {
</span><span class="cx"> $all_meta = bp_activity_get_meta( $activity_id );
</span><span class="lines">@@ -615,12 +610,6 @@
</span><span class="cx"> * @return mixed The meta value(s) being requested.
</span><span class="cx"> */
</span><span class="cx"> function bp_activity_get_meta( $activity_id = 0, $meta_key = '', $single = true ) {
</span><del>-
- // Make sure activity_id is valid
- if ( empty( $activity_id ) || ! is_numeric( $activity_id ) ) {
- return false;
- }
-
</del><span class="cx"> add_filter( 'query', 'bp_filter_metaid_column_name' );
</span><span class="cx"> $retval = get_metadata( 'activity', $activity_id, $meta_key, $single );
</span><span class="cx"> remove_filter( 'query', 'bp_filter_metaid_column_name' );
</span><span class="lines">@@ -646,12 +635,6 @@
</span><span class="cx"> * returns the integer ID of the new metadata row.
</span><span class="cx"> */
</span><span class="cx"> function bp_activity_update_meta( $activity_id, $meta_key, $meta_value, $prev_value = '' ) {
</span><del>-
- // Legacy - Make sure activity_id is valid
- if ( ! is_numeric( $activity_id ) ) {
- return false;
- }
-
</del><span class="cx"> add_filter( 'query', 'bp_filter_metaid_column_name' );
</span><span class="cx"> $retval = update_metadata( 'activity', $activity_id, $meta_key, $meta_value, $prev_value );
</span><span class="cx"> remove_filter( 'query', 'bp_filter_metaid_column_name' );
</span></span></pre></div>
<a id="trunkbpblogsbpblogsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-functions.php (8134 => 8135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-functions.php 2014-03-14 01:06:37 UTC (rev 8134)
+++ trunk/bp-blogs/bp-blogs-functions.php 2014-03-14 01:12:13 UTC (rev 8135)
</span><span class="lines">@@ -848,11 +848,6 @@
</span><span class="cx"> function bp_blogs_delete_blogmeta( $blog_id, $meta_key = false, $meta_value = false, $delete_all = false ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- // Legacy - return false if the $blog_id is empty
- if ( ! is_numeric( $blog_id ) ) {
- return false;
- }
-
</del><span class="cx"> // Legacy - if no meta_key is passed, delete all for the blog_id
</span><span class="cx"> if ( empty( $meta_key ) ) {
</span><span class="cx"> $keys = $wpdb->get_col( $wpdb->prepare( "SELECT meta_key FROM {$wpdb->blogmeta} WHERE blog_id = %d", $blog_id ) );
</span><span class="lines">@@ -863,6 +858,7 @@
</span><span class="cx">
</span><span class="cx"> add_filter( 'query', 'bp_filter_metaid_column_name' );
</span><span class="cx">
</span><ins>+ $retval = false;
</ins><span class="cx"> foreach ( $keys as $key ) {
</span><span class="cx"> $retval = delete_metadata( 'blog', $blog_id, $key, $meta_value, $delete_all );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-functions.php (8134 => 8135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-functions.php 2014-03-14 01:06:37 UTC (rev 8134)
+++ trunk/bp-groups/bp-groups-functions.php 2014-03-14 01:12:13 UTC (rev 8135)
</span><span class="lines">@@ -1032,11 +1032,6 @@
</span><span class="cx"> function groups_delete_groupmeta( $group_id, $meta_key = false, $meta_value = false, $delete_all = false ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- // Legacy - return false if non-int group ID
- if ( ! is_numeric( $group_id ) ) {
- return false;
- }
-
</del><span class="cx"> // Legacy - if no meta_key is passed, delete all for the item
</span><span class="cx"> if ( empty( $meta_key ) ) {
</span><span class="cx"> $keys = $wpdb->get_col( $wpdb->prepare( "SELECT meta_key FROM {$wpdb->groupmeta} WHERE group_id = %d", $group_id ) );
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofilefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-functions.php (8134 => 8135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-functions.php 2014-03-14 01:06:37 UTC (rev 8134)
+++ trunk/bp-xprofile/bp-xprofile-functions.php 2014-03-14 01:12:13 UTC (rev 8135)
</span><span class="lines">@@ -578,12 +578,7 @@
</span><span class="cx"> function bp_xprofile_delete_meta( $object_id, $object_type, $meta_key = false, $meta_value = false, $delete_all = false ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- // Legacy - no empty object id
- if ( empty( $object_id ) ) {
- return false;
- }
-
- // Legacy - sanitize object type
</del><ins>+ // Sanitize object type
</ins><span class="cx"> if ( ! in_array( $object_type, array( 'group', 'field', 'data' ) ) ) {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -603,6 +598,7 @@
</span><span class="cx"> add_filter( 'query', 'bp_filter_metaid_column_name' );
</span><span class="cx"> add_filter( 'query', 'bp_xprofile_filter_meta_query' );
</span><span class="cx">
</span><ins>+ $retval = false;
</ins><span class="cx"> foreach ( $keys as $key ) {
</span><span class="cx"> $retval = delete_metadata( 'xprofile_' . $object_type, $object_id, $key, $meta_value, $delete_all );
</span><span class="cx"> }
</span><span class="lines">@@ -629,7 +625,7 @@
</span><span class="cx"> * @return mixed Meta value if found. False on failure.
</span><span class="cx"> */
</span><span class="cx"> function bp_xprofile_get_meta( $object_id, $object_type, $meta_key = '', $single = true ) {
</span><del>- // Legacy - sanitize object type
</del><ins>+ // Sanitize object type
</ins><span class="cx"> if ( ! in_array( $object_type, array( 'group', 'field', 'data' ) ) ) {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>