<!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][4041] trunk: Swap some more function_exists calls to bp_is_active.</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>4041</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-02-12 20:50:26 +0000 (Sat, 12 Feb 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Swap some more function_exists calls to bp_is_active. See #2718</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitytemplatephp">trunk/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunkbpblogsbpblogsactivityphp">trunk/bp-blogs/bp-blogs-activity.php</a></li>
<li><a href="#trunkbpblogsbpblogsloaderphp">trunk/bp-blogs/bp-blogs-loader.php</a></li>
<li><a href="#trunkbpcoreadminbpcoreadminphp">trunk/bp-core/admin/bp-core-admin.php</a></li>
<li><a href="#trunkbpcoreadminbpcoreupdatephp">trunk/bp-core/admin/bp-core-update.php</a></li>
<li><a href="#trunkbpcorebpcorefiltersphp">trunk/bp-core/bp-core-filters.php</a></li>
<li><a href="#trunkbpfriendsbpfriendsactivityphp">trunk/bp-friends/bp-friends-activity.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsactivityphp">trunk/bp-groups/bp-groups-activity.php</a></li>
<li><a href="#trunkbpmembersbpmemberssignupphp">trunk/bp-members/bp-members-signup.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileclassesphp">trunk/bp-xprofile/bp-xprofile-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-template.php (4040 => 4041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-template.php 2011-02-12 19:30:30 UTC (rev 4040)
+++ trunk/bp-activity/bp-activity-template.php 2011-02-12 20:50:26 UTC (rev 4041)
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx">
</span><span class="cx"> switch ( $scope ) {
</span><span class="cx"> case 'friends':
</span><del>- if ( function_exists( 'friends_get_friend_user_ids' ) )
</del><ins>+ if ( bp_is_active( 'friends' ) )
</ins><span class="cx"> $friends = friends_get_friend_user_ids( $user_id );
</span><span class="cx"> if ( empty( $friends ) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> $user_id = implode( ',', (array)$friends );
</span><span class="cx"> break;
</span><span class="cx"> case 'groups':
</span><del>- if ( function_exists( 'groups_get_user_groups' ) ) {
</del><ins>+ if ( bp_is_active( 'groups' ) ) {
</ins><span class="cx"> $groups = groups_get_user_groups( $user_id );
</span><span class="cx"> if ( empty( $groups['groups'] ) )
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkbpblogsbpblogsactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-activity.php (4040 => 4041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-activity.php 2011-02-12 19:30:30 UTC (rev 4040)
+++ trunk/bp-blogs/bp-blogs-activity.php 2011-02-12 20:50:26 UTC (rev 4041)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> function bp_blogs_register_activity_actions() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !function_exists( 'bp_activity_set_action' ) )
</del><ins>+ if ( !bp_is_active( 'activity' ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bp_activity_set_action( $bp->blogs->id, 'new_blog', __( 'New blog created', 'buddypress' ) );
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> function bp_blogs_record_activity( $args = '' ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !function_exists( 'bp_activity_add' ) )
</del><ins>+ if ( !bp_is_active( 'activity' ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> * anything else we may need to manually instantiate the activity
</span><span class="cx"> * component globals.
</span><span class="cx"> */
</span><del>- if ( !$bp->activity && function_exists('bp_activity_setup_globals') )
</del><ins>+ if ( !$bp->activity && bp_is_active( 'activity' ) )
</ins><span class="cx"> bp_activity_setup_globals();
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><span class="cx"> // Remove large images and replace them with just one image thumbnail
</span><del>- if ( function_exists( 'bp_activity_thumbnail_content_images' ) && !empty( $content ) )
</del><ins>+ if ( bp_is_active( 'activity' ) && !empty( $content ) )
</ins><span class="cx"> $content = bp_activity_thumbnail_content_images( $content, $primary_link );
</span><span class="cx">
</span><span class="cx"> if ( !empty( $action ) )
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> function bp_blogs_delete_activity( $args = true ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( function_exists( 'bp_activity_delete_by_item_id' ) ) {
</del><ins>+ if ( bp_is_active( 'activity' ) ) {
</ins><span class="cx"> $defaults = array(
</span><span class="cx"> 'item_id' => false,
</span><span class="cx"> 'component' => $bp->blogs->id,
</span></span></pre></div>
<a id="trunkbpblogsbpblogsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-loader.php (4040 => 4041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-loader.php 2011-02-12 19:30:30 UTC (rev 4040)
+++ trunk/bp-blogs/bp-blogs-loader.php 2011-02-12 20:50:26 UTC (rev 4041)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> // Set up the component options navigation for Blog
</span><span class="cx"> if ( bp_is_blogs_component() ) {
</span><span class="cx"> if ( bp_is_my_profile() ) {
</span><del>- if ( function_exists('xprofile_setup_nav') ) {
</del><ins>+ if ( bp_is_active( 'xprofile' ) ) {
</ins><span class="cx"> $bp->bp_options_title = __( 'My Blogs', 'buddypress' );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcoreadminbpcoreadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-admin.php (4040 => 4041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-admin.php 2011-02-12 19:30:30 UTC (rev 4040)
+++ trunk/bp-core/admin/bp-core-admin.php 2011-02-12 20:50:26 UTC (rev 4041)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><del>- <?php if ( function_exists( 'bp_forums_setup') ) : ?>
</del><ins>+ <?php if ( bp_is_active( 'forums' ) ) : ?>
</ins><span class="cx">
</span><span class="cx"> <tr>
</span><span class="cx"> <th scope="row"><?php _e( 'Disable global forum directory?', 'buddypress' ) ?>:</th>
</span></span></pre></div>
<a id="trunkbpcoreadminbpcoreupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-update.php (4040 => 4041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-update.php 2011-02-12 19:30:30 UTC (rev 4040)
+++ trunk/bp-core/admin/bp-core-update.php 2011-02-12 20:50:26 UTC (rev 4041)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> if ( $this->database_version < $this->new_version )
</span><span class="cx"> $steps[] = __( 'Database Update', 'buddypress' );
</span><span class="cx">
</span><del>- if ( $this->database_version < 1225 || ( function_exists( 'bp_core_get_page_meta' ) && !bp_core_get_page_meta() ) )
</del><ins>+ if ( $this->database_version < 1225 || !bp_core_get_page_meta() )
</ins><span class="cx"> $steps[] = __( 'Pages', 'buddypress' );
</span><span class="cx">
</span><span class="cx"> $steps[] = __( 'Finish', 'buddypress' );
</span></span></pre></div>
<a id="trunkbpcorebpcorefiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-filters.php (4040 => 4041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-filters.php 2011-02-12 19:30:30 UTC (rev 4040)
+++ trunk/bp-core/bp-core-filters.php 2011-02-12 20:50:26 UTC (rev 4041)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> if ( !empty( $bp->pages->register ) )
</span><span class="cx"> $pages[] = $bp->pages->register->id;
</span><span class="cx">
</span><del>- if ( !bp_is_active( 'forums' ) || ( function_exists( 'bp_forums_is_installed_correctly' ) && !bp_forums_is_installed_correctly() ) )
</del><ins>+ if ( !bp_is_active( 'forums' ) || ( bp_is_active( 'forums' ) && !bp_forums_is_installed_correctly() ) )
</ins><span class="cx"> if ( !empty( $bp->pages->forums ) )
</span><span class="cx"> $pages[] = $bp->pages->forums->id;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendsactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-activity.php (4040 => 4041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-activity.php 2011-02-12 19:30:30 UTC (rev 4040)
+++ trunk/bp-friends/bp-friends-activity.php 2011-02-12 20:50:26 UTC (rev 4041)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> function friends_record_activity( $args = '' ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !function_exists( 'bp_activity_add' ) )
</del><ins>+ if ( !bp_is_active( 'activity' ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $defaults = array (
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> function friends_register_activity_actions() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !function_exists( 'bp_activity_set_action' ) )
</del><ins>+ if ( !bp_is_active( 'activity' ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bp_activity_set_action( $bp->friends->id, 'friends_register_activity_action', __( 'New friendship created', 'buddypress' ) );
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-activity.php (4040 => 4041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-activity.php 2011-02-12 19:30:30 UTC (rev 4040)
+++ trunk/bp-groups/bp-groups-activity.php 2011-02-12 20:50:26 UTC (rev 4041)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> function groups_register_activity_actions() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !function_exists( 'bp_activity_set_action' ) )
</del><ins>+ if ( !bp_is_active( 'activity' ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bp_activity_set_action( $bp->groups->id, 'created_group', __( 'Created a group', 'buddypress' ) );
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> function groups_record_activity( $args = '' ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !function_exists( 'bp_activity_add' ) )
</del><ins>+ if ( !bp_is_active( 'activity' ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // If the group is not public, hide the activity sitewide.
</span></span></pre></div>
<a id="trunkbpmembersbpmemberssignupphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-signup.php (4040 => 4041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-signup.php 2011-02-12 19:30:30 UTC (rev 4040)
+++ trunk/bp-members/bp-members-signup.php 2011-02-12 20:50:26 UTC (rev 4041)
</span><span class="lines">@@ -495,7 +495,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_members_new_user_activity( $user ) {
</span><del>- if ( empty( $user ) || !function_exists( 'bp_activity_add' ) )
</del><ins>+ if ( empty( $user ) || !bp_is_active( 'activity' ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( is_array( $user ) )
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-classes.php (4040 => 4041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-classes.php 2011-02-12 19:30:30 UTC (rev 4040)
+++ trunk/bp-xprofile/bp-xprofile-classes.php 2011-02-12 20:50:26 UTC (rev 4041)
</span><span class="lines">@@ -688,7 +688,7 @@
</span><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php if ( function_exists( 'wp_nonce_field' ) ) wp_nonce_field( 'xprofile_delete_option' ); ?>
</del><ins>+ <?php wp_nonce_field( 'xprofile_delete_option' ); ?>
</ins><span class="cx">
</span><span class="cx"> </form>
</span><span class="cx"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>