From d01e8db4adced4f82239ce8ec8f2cc2bf6a4c6d3 Mon Sep 17 00:00:00 2001
From: Eric Lewis <eric.andrew.lewis@gmail.com>
Date: Tue, 26 Jan 2016 00:32:27 +0000
Subject: [PATCH] Plugins: Clarify that mu-plugins can't be "active" in docs.

Plugins installed in the plugins/ folder can be activated by users. This puts the plugin in an "active" state. Plugins in the mu-folder/ are "must-use" plugins that are always loaded. They can't be activated, and thereby can't be "active." Because of this, using the `is_plugin_active()` or `is_plugin_active_for_network()` returns false when checking for these plugins. This clarifies that behavior in the functions' docs.

Built from https://develop.svn.wordpress.org/trunk@36397


git-svn-id: http://core.svn.wordpress.org/trunk@36364 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/plugin.php | 12 +++++++++++-
 wp-includes/version.php      |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index 0b504b5994..9c4f913548 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -427,7 +427,12 @@ function _get_dropins() {
 }
 
 /**
- * Check whether the plugin is active by checking the active_plugins list.
+ * Check whether a plugin is active.
+ *
+ * Only plugins installed in the plugins/ folder can be active.
+ *
+ * Plugins in the mu-plugins/ folder can't be "activated," so this function will
+ * return false for those plugins.
  *
  * @since 2.5.0
  *
@@ -456,6 +461,11 @@ function is_plugin_inactive( $plugin ) {
 /**
  * Check whether the plugin is active for the entire network.
  *
+ * Only plugins installed in the plugins/ folder can be active.
+ *
+ * Plugins in the mu-plugins/ folder can't be "activated," so this function will
+ * return false for those plugins.
+ *
  * @since 3.0.0
  *
  * @param string $plugin Base plugin path from plugins directory.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index aa7a9b1d92..5910c982af 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36396';
+$wp_version = '4.5-alpha-36397';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.