Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-23 00:31:28 +01:00
Code Issues Projects Releases Wiki Activity

Always return a value in Plugin_Upgrader::deactivate_plugin_before_upgrade(). Props jdgrimes. Fixes #29088.

Browse Source 
Built from https://develop.svn.wordpress.org/trunk@30761


git-svn-id: http://core.svn.wordpress.org/trunk@30751 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-12-07 00:53:23 +00:00
parent 53d22ffb10
commit 1bb4b6a82b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/class-wp-upgrader.php
View File

@ -1036,6 +1036,8 @@ class Plugin_Upgrader extends WP_Upgrader {
//Deactivate the plugin silently, Prevent deactivation hooks from running. //Deactivate the plugin silently, Prevent deactivation hooks from running.
deactivate_plugins($plugin, true); deactivate_plugins($plugin, true);
} }
return $return;
} }
/** /**

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.1-beta2-30760'; $wp_version = '4.1-beta2-30761';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.