From 820991ac955b07bb1da4b7106903dd06f2894d67 Mon Sep 17 00:00:00 2001
From: Peter Westwood <westi@git.wordpress.org>
Date: Thu, 7 Jan 2010 07:41:13 +0000
Subject: [PATCH] Switch from create_function to a fixed function for the
 plugin page activation admin notice. Fixes #11763 props dd32.

git-svn-id: https://develop.svn.wordpress.org/trunk@12636 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/plugin.php | 11 +++++++++++
 wp-admin/plugins.php         |  4 +---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index 2ff9038aa7..2274f344a0 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -1124,4 +1124,15 @@ function settings_fields($option_group) {
 	wp_nonce_field("$option_group-options");
 }
 
+/**
+ * Outputs the notice message for multisite regarding activation of plugin page.
+ *
+ * @since 3.0
+ * @return none
+ */
+function _admin_notice_multisite_activate_plugins_page() {
+	$message = sprintf( __( 'The plugins page is not visible to normal users. It must be activated first. %s' ), '<a href="ms-options.php#menu">' . __( 'Activate' ) . '</a>' );
+	echo "<div class='error'><p>$message</p></div>";
+}
+
 ?>
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index e94439de3e..c150be4261 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -239,9 +239,7 @@ add_contextual_help('plugins', $help);
 if ( is_multisite() && is_super_admin() ) {
 	$menu_perms = get_site_option('menu_items', array());
 	if ( !$menu_perms['plugins'] ) {
-		$message = sprintf( __( 'The plugins page is not visible to normal users. It must be activated first. %s' ), '<a href="ms-options.php#menu">' . __( 'Activate' ) . '</a>' );
-		$message = str_replace( "'", "\'", "<div class='error'><p>$message</p></div>" );
-		add_action( 'admin_notices', create_function( '', "echo '$message';" ) );
+		add_action( 'admin_notices', '_admin_notice_multisite_activate_plugins_page' );
 	}
 }