<!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][6479] trunk/bp-activity: Add new function to get details of all registered activity types</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/6479">6479</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2012-10-31 10:41:57 +0000 (Wed, 31 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add new function to get details of all registered activity types
* This was taken from part of the list table code for the Activity admin screens
* Activity admin list table has been updated to use this function
* It will be re-used in template functions to be added in future commits</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityadminphp">trunk/bp-activity/bp-activity-admin.php</a></li>
<li><a href="#trunkbpactivitybpactivityfunctionsphp">trunk/bp-activity/bp-activity-functions.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 (6478 => 6479)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-admin.php        2012-10-30 15:05:11 UTC (rev 6478)
+++ trunk/bp-activity/bp-activity-admin.php        2012-10-31 10:41:57 UTC (rev 6479)
</span><span class="lines">@@ -1172,34 +1172,17 @@
</span><span class="cx">         /**
</span><span class="cx">          * Markup for the "filter" part of the form (i.e. which activity type to display)
</span><span class="cx">          *
</span><del>-         * @global object $bp BuddyPress global settings
</del><span class="cx">          * @param string $which 'top' or 'bottom'
</span><span class="cx">          * @since BuddyPress (1.6)
</span><span class="cx">          */
</span><span class="cx">         function extra_tablenav( $which ) {
</span><del>-                global $bp;
-
</del><span class="cx">                 if ( 'bottom' == $which )
</span><span class="cx">                         return;
</span><span class="cx">
</span><del>-                $actions = array();
</del><span class="cx">                 $selected = !empty( $_REQUEST['activity_type'] ) ? $_REQUEST['activity_type'] : '';
</span><span class="cx">
</span><del>-                // Walk through the registered actions, and build an array of actions/values.
-                foreach ( $bp->activity->actions as $action ) {
-                        $action = array_values( (array) $action );
-
-                        for ( $i = 0, $i_count = count( $action ); $i < $i_count; $i++ )
-                                $actions[ $action[$i]['key'] ] = $action[$i]['value'];
-                }
-
-                // This was a mis-named activity type from before BP 1.6
-                unset( $actions['friends_register_activity_action'] );
-
-                // This type has not been used since BP 1.0.3. It will be re-instated in a future version.
-                unset( $actions['updated_profile'] );
-
-                // Sort array by the human-readable value
</del><ins>+                // Get all types of activities, and sort alphabetically.
+                $actions = bp_activity_get_types();
</ins><span class="cx">                 natsort( $actions );
</span><span class="cx">         ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-functions.php (6478 => 6479)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-functions.php        2012-10-30 15:05:11 UTC (rev 6478)
+++ trunk/bp-activity/bp-activity-functions.php        2012-10-31 10:41:57 UTC (rev 6479)
</span><span class="lines">@@ -236,6 +236,32 @@
</span><span class="cx">         return apply_filters( 'bp_activity_get_action', $bp->activity->actions->{$component_id}->{$key}, $component_id, $key );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Fetch details of all registered activity types
+ *
+ * @return array array( type => description ), ...
+ * @since BuddyPress (1.7)
+ */
+function bp_activity_get_types() {
+        $actions = array();
+
+        // Walk through the registered actions, and build an array of actions/values.
+        foreach ( buddypress()->activity->actions as $action ) {
+                $action = array_values( (array) $action );
+
+                for ( $i = 0, $i_count = count( $action ); $i < $i_count; $i++ )
+                        $actions[ $action[$i]['key'] ] = $action[$i]['value'];
+        }
+
+        // This was a mis-named activity type from before BP 1.6
+        unset( $actions['friends_register_activity_action'] );
+
+        // This type has not been used since BP 1.0.3. It will be re-instated in a future version.
+        unset( $actions['updated_profile'] );
+
+        return apply_filters( 'bp_activity_get_types', $actions );
+}
+
</ins><span class="cx"> /** Favorites ****************************************************************/
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>