Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasgriffin committed Feb 3, 2012
2 parents 8dd7cab + 8a771b9 commit b85af3d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
6 changes: 5 additions & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
=== TGM Plugin Activation ===
Contributors: Thomas Griffin (@jthomasgriffin / thomasgriffinmedia.com)
Gary Jones (Github: @GaryJones / Twitter: GaryJ)
Version: 2.3.1
Version: 2.3.2
Requires at least: 3.0.0
Tested up to: 3.3.1

Expand Down Expand Up @@ -35,6 +35,10 @@ You can also follow project progress and updates on Twitter. Follow us here at h

== Changelog ==

= 2.3.2 =

* Fixed bug (100%) with not loading class properly

= 2.3.1 =

* Fixed bug with not finding class (reverted back to Plugin_Upgrader)
Expand Down
4 changes: 2 additions & 2 deletions tgm-plugin-activation/class-tgm-plugin-activation.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin installation and activation for WordPress themes.
*
* @package TGM-Plugin-Activation
* @version 2.3.1
* @version 2.3.2
* @author Thomas Griffin <[email protected]>
* @author Gary Jones <[email protected]>
* @copyright Copyright (c) 2012, Thomas Griffin
Expand Down Expand Up @@ -1585,7 +1585,7 @@ public function prepare_items() {
*
* @since 2.2.0
*/
if ( ! class_exists( 'WP_Upgrader' ) && isset( $_GET[sanitize_key( 'page' )] ) && TGM_Plugin_Activation::$instance->menu == $_GET[sanitize_key( 'page' )] ) {
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' ) ) {
Expand Down
2 changes: 1 addition & 1 deletion tgm-plugin-activation/example.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* @package TGM-Plugin-Activation
* @subpackage Example
* @version 2.3.1
* @version 2.3.2
* @author Thomas Griffin <[email protected]>
* @author Gary Jones <[email protected]>
* @copyright Copyright (c) 2012, Thomas Griffin
Expand Down

0 comments on commit b85af3d

Please sign in to comment.