Merge branch 'dev'

TGMPA · Jan 5, 2012 · 09067fd · 09067fd
2 parents d32e576 + b87c5bf
commit 09067fd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/README b/README
@@ -3,7 +3,7 @@ Contributors:      Thomas Griffin (@jthomasgriffin / thomasgriffinmedia.com)
                    Gary Jones (Github: @GaryJones / Twitter: GaryJ)
 Version:           2.2.0
 Requires at least: 3.0.0
-Tested up to:      3.3
+Tested up to:      3.3.1
 
 == Description ==
 
@@ -35,6 +35,10 @@ You can also follow project progress and updates on Twitter. Follow us here at h
 
 == Changelog ==
 
+= 2.2.1 =
+
+* Fixed bug that caused WordPress core upgrades to fail (WordPress doesn't check for including WP_Upgrader on core upgrades)
+
 = 2.2.0 =
 
 * Fixed erroneous links for plugins linked to the WordPress Repo

diff --git a/tgm-plugin-activation/class-tgm-plugin-activation.php b/tgm-plugin-activation/class-tgm-plugin-activation.php
@@ -1571,7 +1571,7 @@ public function prepare_items() {
  *
  * @since 2.2.0
  */
-if ( ! class_exists( 'WP_Upgrader' ) && ( ! isset( $_GET[sanitize_key( 'action' )] ) || ! isset( $_GET[sanitize_key( 'activate' )] ) ) ) {
+if ( ! class_exists( 'WP_Upgrader' ) && isset( $_GET[sanitize_key( 'page' )] ) && TGM_Plugin_Activation::$instance->menu == $_GET[sanitize_key( 'page' )] ) {
 	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 
 	if ( ! class_exists( 'TGM_Bulk_Installer' ) ) {