<!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][3775] branches/1.2: Fixes function_exists error in previous commit.</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>3775</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-01-20 21:08:27 +0000 (Thu, 20 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes function_exists error in previous commit. Adjusts admin menu hooks to be compatible with Network Admin in WP 3.1. Fixes #3017</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpactivityphp">branches/1.2/bp-activity.php</a></li>
<li><a href="#branches12bpblogsphp">branches/1.2/bp-blogs.php</a></li>
<li><a href="#branches12bpcorebpcoreadminbarphp">branches/1.2/bp-core/bp-core-adminbar.php</a></li>
<li><a href="#branches12bpcorephp">branches/1.2/bp-core.php</a></li>
<li><a href="#branches12bpforumsphp">branches/1.2/bp-forums.php</a></li>
<li><a href="#branches12bpfriendsphp">branches/1.2/bp-friends.php</a></li>
<li><a href="#branches12bpgroupsphp">branches/1.2/bp-groups.php</a></li>
<li><a href="#branches12bpmessagesphp">branches/1.2/bp-messages.php</a></li>
<li><a href="#branches12bpxprofilebpxprofilecssjsphp">branches/1.2/bp-xprofile/bp-xprofile-cssjs.php</a></li>
<li><a href="#branches12bpxprofilephp">branches/1.2/bp-xprofile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpactivityphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-activity.php (3774 => 3775)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-activity.php 2011-01-20 20:34:52 UTC (rev 3774)
+++ branches/1.2/bp-activity.php 2011-01-20 21:08:27 UTC (rev 3775)
</span><span class="lines">@@ -99,6 +99,7 @@
</span><span class="cx"> bp_activity_install();
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'bp_activity_check_installed' );
</span><ins>+add_action( 'network_admin_menu', 'bp_activity_check_installed' );
</ins><span class="cx">
</span><span class="cx"> function bp_activity_setup_root_component() {
</span><span class="cx"> /* Register 'activity' as a root component (for RSS feed use) */
</span></span></pre></div>
<a id="branches12bpblogsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-blogs.php (3774 => 3775)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-blogs.php 2011-01-20 20:34:52 UTC (rev 3774)
+++ branches/1.2/bp-blogs.php 2011-01-20 21:08:27 UTC (rev 3775)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'bp_blogs_check_installed' );
</span><ins>+add_action( 'network_admin_menu', 'bp_blogs_check_installed' );
</ins><span class="cx">
</span><span class="cx"> function bp_blogs_setup_globals() {
</span><span class="cx"> global $bp, $wpdb;
</span></span></pre></div>
<a id="branches12bpcorebpcoreadminbarphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-adminbar.php (3774 => 3775)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-adminbar.php 2011-01-20 20:34:52 UTC (rev 3774)
+++ branches/1.2/bp-core/bp-core-adminbar.php 2011-01-20 21:08:27 UTC (rev 3775)
</span><span class="lines">@@ -291,7 +291,8 @@
</span><span class="cx"> return;
</span><span class="cx"> } elseif ( !defined( 'BP_DISABLE_ADMIN_BAR' ) || !BP_DISABLE_ADMIN_BAR ) {
</span><span class="cx"> // Keep the WP admin bar from loading
</span><del>- show_admin_bar( false );
</del><ins>+ if ( function_exists( 'show_admin_bar' ) )
+ show_admin_bar( false );
</ins><span class="cx">
</span><span class="cx"> // Actions used to build the BP admin bar
</span><span class="cx"> add_action( 'bp_adminbar_logo', 'bp_adminbar_logo' );
</span></span></pre></div>
<a id="branches12bpcorephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core.php (3774 => 3775)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core.php 2011-01-20 20:34:52 UTC (rev 3774)
+++ branches/1.2/bp-core.php 2011-01-20 21:08:27 UTC (rev 3775)
</span><span class="lines">@@ -285,6 +285,7 @@
</span><span class="cx"> bp_core_install();
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'bp_core_check_installed' );
</span><ins>+add_action( 'network_admin_menu', 'bp_core_check_installed' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * bp_core_add_admin_menu()
</span><span class="lines">@@ -300,7 +301,11 @@
</span><span class="cx"> if ( !is_super_admin() )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- /* Add the administration tab under the "Site Admin" tab for site administrators */
</del><ins>+ // If this is WP 3.1+ and multisite is enabled, only load on the Network Admin
+ if ( is_multisite() && function_exists( 'is_network_admin' ) && ! is_network_admin() )
+ return false;
+
+ // Add the administration tab under the "Site Admin" tab for site administrators
</ins><span class="cx"> bp_core_add_admin_menu_page( array(
</span><span class="cx"> 'menu_title' => __( 'BuddyPress', 'buddypress' ),
</span><span class="cx"> 'page_title' => __( 'BuddyPress', 'buddypress' ),
</span><span class="lines">@@ -313,6 +318,7 @@
</span><span class="cx"> add_submenu_page( 'bp-general-settings', __( 'Component Setup', 'buddypress'), __( 'Component Setup', 'buddypress' ), 'manage_options', 'bp-component-setup', 'bp_core_admin_component_setup' );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'bp_core_add_admin_menu' );
</span><ins>+add_action( 'network_admin_menu', 'bp_core_add_admin_menu' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * bp_core_is_root_component()
</span></span></pre></div>
<a id="branches12bpforumsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-forums.php (3774 => 3775)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-forums.php 2011-01-20 20:34:52 UTC (rev 3774)
+++ branches/1.2/bp-forums.php 2011-01-20 21:08:27 UTC (rev 3775)
</span><span class="lines">@@ -103,6 +103,7 @@
</span><span class="cx"> add_submenu_page( 'bp-general-settings', __( 'Forums Setup', 'buddypress' ), __( 'Forums Setup', 'buddypress' ), 'manage_options', 'bb-forums-setup', "bp_forums_bbpress_admin" );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'bp_forums_add_admin_menu' );
</span><ins>+add_action( 'network_admin_menu', 'bp_forums_add_admin_menu' );
</ins><span class="cx">
</span><span class="cx"> /* Forum Functions */
</span><span class="cx">
</span></span></pre></div>
<a id="branches12bpfriendsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-friends.php (3774 => 3775)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-friends.php 2011-01-20 20:34:52 UTC (rev 3774)
+++ branches/1.2/bp-friends.php 2011-01-20 21:08:27 UTC (rev 3775)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> friends_install();
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'friends_check_installed' );
</span><ins>+add_action( 'network_admin_menu', 'friends_check_installed' );
</ins><span class="cx">
</span><span class="cx"> function friends_setup_nav() {
</span><span class="cx"> global $bp;
</span></span></pre></div>
<a id="branches12bpgroupsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-groups.php (3774 => 3775)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-groups.php 2011-01-20 20:34:52 UTC (rev 3774)
+++ branches/1.2/bp-groups.php 2011-01-20 21:08:27 UTC (rev 3775)
</span><span class="lines">@@ -117,6 +117,7 @@
</span><span class="cx"> groups_install();
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'groups_check_installed' );
</span><ins>+add_action( 'network_admin_menu', 'groups_check_installed' );
</ins><span class="cx">
</span><span class="cx"> function groups_setup_nav() {
</span><span class="cx"> global $bp;
</span></span></pre></div>
<a id="branches12bpmessagesphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-messages.php (3774 => 3775)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-messages.php 2011-01-20 20:34:52 UTC (rev 3774)
+++ branches/1.2/bp-messages.php 2011-01-20 21:08:27 UTC (rev 3775)
</span><span class="lines">@@ -97,6 +97,7 @@
</span><span class="cx"> messages_install();
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'messages_check_installed' );
</span><ins>+add_action( 'network_admin_menu', 'messages_check_installed' );
</ins><span class="cx">
</span><span class="cx"> function messages_setup_nav() {
</span><span class="cx"> global $bp;
</span></span></pre></div>
<a id="branches12bpxprofilebpxprofilecssjsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-xprofile/bp-xprofile-cssjs.php (3774 => 3775)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-xprofile/bp-xprofile-cssjs.php 2011-01-20 20:34:52 UTC (rev 3774)
+++ branches/1.2/bp-xprofile/bp-xprofile-cssjs.php 2011-01-20 21:08:27 UTC (rev 3775)
</span><span class="lines">@@ -1,16 +1,26 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> function xprofile_add_admin_css() {
</span><ins>+ // If this is WP 3.1+ and multisite is enabled, only load on the Network Admin
+ if ( is_multisite() && function_exists( 'is_network_admin' ) && ! is_network_admin() )
+ return false;
+
</ins><span class="cx"> wp_enqueue_style( 'xprofile-admin-css', BP_PLUGIN_URL . '/bp-xprofile/admin/css/admin.css' );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'xprofile_add_admin_css' );
</span><ins>+add_action( 'network_admin_menu', 'xprofile_add_admin_css' );
</ins><span class="cx">
</span><span class="cx"> function xprofile_add_admin_js() {
</span><ins>+ // If this is WP 3.1+ and multisite is enabled, only load on the Network Admin
+ if ( is_multisite() && function_exists( 'is_network_admin' ) && ! is_network_admin() )
+ return false;
+
</ins><span class="cx"> if ( strpos( $_GET['page'], 'bp-profile-setup' ) !== false ) {
</span><span class="cx"> wp_enqueue_script( array( "jquery-ui-sortable" ) );
</span><span class="cx"> wp_enqueue_script( 'xprofile-admin-js', BP_PLUGIN_URL . '/bp-xprofile/admin/js/admin.js', array( 'jquery' ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'xprofile_add_admin_js', 1 );
</span><ins>+add_action( 'network_admin_menu', 'xprofile_add_admin_js', 1 );
</ins><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branches12bpxprofilephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-xprofile.php (3774 => 3775)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-xprofile.php 2011-01-20 20:34:52 UTC (rev 3774)
+++ branches/1.2/bp-xprofile.php 2011-01-20 21:08:27 UTC (rev 3775)
</span><span class="lines">@@ -152,6 +152,7 @@
</span><span class="cx"> xprofile_install();
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'xprofile_add_admin_menu' );
</span><ins>+add_action( 'network_admin_menu', 'xprofile_add_admin_menu' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * xprofile_setup_nav()
</span></span></pre>
</div>
</div>
</body>
</html>