From 578469fb12665d3504529eab1d583b201900dd52 Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Sun, 1 Dec 2013 23:13:09 +0000 Subject: [PATCH] Add braces around a conditional hook. This wasn't causing an issue as `if ( conditional ) /* multiline comment */ command();` is perfectly OK, but left open doubt and potential future bugs. See #25229 Built from https://develop.svn.wordpress.org/trunk@26509 git-svn-id: http://core.svn.wordpress.org/trunk@26403 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/plugin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 9a25da5eae..8a2cd9b749 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -623,7 +623,7 @@ function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) { $network_deactivating = false !== $network_wide && is_plugin_active_for_network( $plugin ); - if ( ! $silent ) + if ( ! $silent ) { /** * Fires for each plugin being deactivated in deactivate_plugins(), before deactivation * and when the $silent parameter is false. @@ -635,6 +635,7 @@ function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) { * or just the current site. Multisite only. Default is false. */ do_action( 'deactivate_plugin', $plugin, $network_deactivating ); + } if ( false !== $network_wide ) { if ( is_plugin_active_for_network( $plugin ) ) {