Merge pull request #361 from thomasgriffin/feature/minor-changes

Two very minor changes
TGMPA · Apr 27, 2015 · 10bee0c · 10bee0c
2 parents f9703fd + 3dcb82b
commit 10bee0c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/class-tgm-plugin-activation.php b/class-tgm-plugin-activation.php
@@ -442,7 +442,7 @@ public function install_plugins_page() {
 				<?php $plugin_table->prepare_items(); ?>
 
 				<?php
-				if ( isset( $this->message ) ) {
+				if ( isset( $this->message ) && is_string( $this->message ) && ! empty( $this->message ) ) {
 					echo wp_kses_post( $this->message );
 				}
 				?>
@@ -2109,7 +2109,7 @@ public function run( $options ) {
 							wp_clean_plugins_cache();
 
 							// Get the installed plugin file and activate it.
-							$plugin_info = $this->plugin_info( $options['package'] );
+							$plugin_info = $this->plugin_info();
 							$activate    = activate_plugin( $plugin_info );
 
 							// Re-populate the file path now that the plugin has been installed and activated.