<!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][6301] trunk/bp-core/bp-core-update.php: Core Update:</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/6301">6301</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-09-04 02:24:31 +0000 (Tue, 04 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Core Update:
* Port _is_activation() and _is_deactivation() code from bbPress.
* Includes handling for bulk plugin activation/deactivation.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreupdatephp">trunk/bp-core/bp-core-update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoreupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-update.php (6300 => 6301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-update.php 2012-09-04 02:17:13 UTC (rev 6300)
+++ trunk/bp-core/bp-core-update.php 2012-09-04 02:24:31 UTC (rev 6301)
</span><span class="lines">@@ -37,22 +37,27 @@
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.6)
</span><span class="cx"> *
</span><del>- * @global BuddyPress $bp
</del><ins>+ * @uses buddypress()
</ins><span class="cx"> * @return bool True if activating BuddyPress, false if not
</span><span class="cx"> */
</span><span class="cx"> function bp_is_activation( $basename = '' ) {
</span><del>- global $bp;
</del><ins>+ $bp = buddypress();
</ins><span class="cx">
</span><del>- // Baif if action or plugin are empty
- if ( empty( $_GET['action'] ) || empty( $_GET['plugin'] ) )
- return false;
</del><ins>+ $action = false;
+ if ( ! empty( $_REQUEST['action'] ) && ( '-1' != $_REQUEST['action'] ) )
+ $action = $_REQUEST['action'];
+ elseif ( ! empty( $_REQUEST['action2'] ) && ( '-1' != $_REQUEST['action2'] ) )
+ $action = $_REQUEST['action2'];
</ins><span class="cx">
</span><span class="cx"> // Bail if not activating
</span><del>- if ( 'activate' !== $_GET['action'] )
</del><ins>+ if ( empty( $action ) || !in_array( $action, array( 'activate', 'activate-selected' ) ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- // The plugin being activated
- $plugin = isset( $_GET['plugin'] ) ? $_GET['plugin'] : '';
</del><ins>+ // The plugin(s) being activated
+ if ( $action == 'activate' )
+ $plugins = isset( $_GET['plugin'] ) ? array( $_GET['plugin'] ) : array();
+ else
+ $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
</ins><span class="cx">
</span><span class="cx"> // Set basename if empty
</span><span class="cx"> if ( empty( $basename ) && !empty( $bp->basename ) )
</span><span class="lines">@@ -62,11 +67,8 @@
</span><span class="cx"> if ( empty( $basename ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // Bail if plugin is not BuddyPress
- if ( $basename !== $plugin )
- return false;
-
- return true;
</del><ins>+ // Is BuddyPress being activated?
+ return in_array( $basename, $plugins );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -74,22 +76,27 @@
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.6)
</span><span class="cx"> *
</span><del>- * @global BuddyPress $bp
</del><ins>+ * @uses buddypress()
</ins><span class="cx"> * @return bool True if deactivating BuddyPress, false if not
</span><span class="cx"> */
</span><span class="cx"> function bp_is_deactivation( $basename = '' ) {
</span><del>- global $bp;
</del><ins>+ $bp = buddypress();
</ins><span class="cx">
</span><del>- // Baif if action or plugin are empty
- if ( empty( $_GET['action'] ) || empty( $_GET['plugin'] ) )
- return false;
</del><ins>+ $action = false;
+ if ( ! empty( $_REQUEST['action'] ) && ( '-1' != $_REQUEST['action'] ) )
+ $action = $_REQUEST['action'];
+ elseif ( ! empty( $_REQUEST['action2'] ) && ( '-1' != $_REQUEST['action2'] ) )
+ $action = $_REQUEST['action2'];
</ins><span class="cx">
</span><span class="cx"> // Bail if not deactivating
</span><del>- if ( 'deactivate' !== $_GET['action'] )
</del><ins>+ if ( empty( $action ) || !in_array( $action, array( 'deactivate', 'deactivate-selected' ) ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- // The plugin being deactivated
- $plugin = isset( $_GET['plugin'] ) ? $_GET['plugin'] : '';
</del><ins>+ // The plugin(s) being deactivated
+ if ( $action == 'deactivate' )
+ $plugins = isset( $_GET['plugin'] ) ? array( $_GET['plugin'] ) : array();
+ else
+ $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
</ins><span class="cx">
</span><span class="cx"> // Set basename if empty
</span><span class="cx"> if ( empty( $basename ) && !empty( $bp->basename ) )
</span><span class="lines">@@ -99,11 +106,8 @@
</span><span class="cx"> if ( empty( $basename ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // Bail if plugin is not BuddyPress
- if ( $basename !== $plugin )
- return false;
-
- return true;
</del><ins>+ // Is bbPress being deactivated?
+ return in_array( $basename, $plugins );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -193,5 +197,3 @@
</span><span class="cx"> function bp_uninstall() {
</span><span class="cx"> do_action( 'bp_uninstall' );
</span><span class="cx"> }
</span><del>-
-?>
</del></span></pre>
</div>
</div>
</body>
</html>