From 193baf96e7cb4d231de348e9ee26970361bf0ac8 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Thu, 18 Aug 2011 22:40:37 +0000
Subject: [PATCH] Add 'Network Enable' link after installing a theme in the
network admin. props PeteMall, fixes #18468.
git-svn-id: https://develop.svn.wordpress.org/trunk@18569 602fd350-edb4-49c9-b593-d223f7449a82
---
wp-admin/includes/class-wp-upgrader.php | 3 +++
wp-admin/network/themes.php | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php
index 7b344b309a..532d027ba6 100644
--- a/wp-admin/includes/class-wp-upgrader.php
+++ b/wp-admin/includes/class-wp-upgrader.php
@@ -1354,6 +1354,9 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
'activate' => '<a href="' . $activate_link . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate “%s”'), $name ) ) . '">' . __('Activate') . '</a>'
);
+ if ( is_network_admin() && current_user_can( 'manage_network_themes' ) )
+ $install_actions['network_enable'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=enable&theme=' . $template, 'enable-theme_' . $template ) ) . '" title="' . esc_attr__( 'Enable this theme for all sites in this network' ) . '" target="_parent">' . __( 'Network Enable' ) . '</a>';
+
if ( $this->type == 'web' )
$install_actions['themes_page'] = '<a href="' . self_admin_url('theme-install.php') . '" title="' . esc_attr__('Return to Theme Installer') . '" target="_parent">' . __('Return to Theme Installer') . '</a>';
else
diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php
index a5196a8850..a0609578a2 100644
--- a/wp-admin/network/themes.php
+++ b/wp-admin/network/themes.php
@@ -40,7 +40,7 @@ if ( $action ) {
check_admin_referer('enable-theme_' . $_GET['theme']);
$allowed_themes[ $_GET['theme'] ] = true;
update_site_option( 'allowedthemes', $allowed_themes );
- wp_redirect( add_query_arg( 'enabled', '1', $referer ) );
+ wp_redirect( network_admin_url( 'themes.php?enabled=1' ) );
exit;
break;
case 'disable':