Merge branch 'hotfix/1.1.2' into develop

README.md

@@ -4,7 +4,7 @@
 **Tags:** widgets, admin, dashboard, sidebar widgets, dashboard widgets, disable widgets  
 **Requires at least:** 3.5.1  
 **Tested up to:** 4.2  
-**Stable tag:** 1.1.1  
+**Stable tag:** 1.1.2  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -63,6 +63,9 @@ No Screenshots yet.
 
 ## Changelog ##
 
+### 1.1.2 ###
+* Fixed: Removed obsolote hooks that caused an error on plugin (de)activation.
+
 ### 1.1.1 ###
 * New: Repdigit version number.
 * Fixed: Added correct changelog.
@@ -86,6 +89,9 @@ No Screenshots yet.
 
 ## Upgrade Notice ##
 
+### 1.1.2 ###
+Removed obsolte code that caused an error on plugin activation.
+
 ### 1.1.1 ###
 Small changes in this version, only some changelog & translation cleaning.
 

README.txt

@@ -4,7 +4,7 @@ Donate link: http://required.ch/
 Tags: widgets, admin, dashboard, sidebar widgets, dashboard widgets, disable widgets
 Requires at least: 3.5.1
 Tested up to: 4.2
-Stable tag: 1.1.1
+Stable tag: 1.1.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -63,6 +63,9 @@ No Screenshots yet.
 
 == Changelog ==
 
+= 1.1.2 =
+* Fixed: Removed obsolote hooks that caused an error on plugin (de)activation.
+
 = 1.1.1 =
 * New: Repdigit version number.
 * Fixed: Added correct changelog.
@@ -86,6 +89,9 @@ No Screenshots yet.
 
 == Upgrade Notice ==
 
+= 1.1.2 =
+Removed obsolte code that caused an error on plugin activation.
+
 = 1.1.1 =
 Small changes in this version, only some changelog & translation cleaning.
 

wp-widget-disable.php

@@ -15,7 +15,7 @@
  * Plugin Name:       WP Widget Disable
  * Plugin URI:        https://github.com/wearerequired/WP-Widget-Disable
  * Description:       Disable WordPress and Dashboard Widgets with an easy to use interface. Simply use the checkboxes provided under <strong>Appearance -> Disable Widgets</strong> and select the Widgets you'd like to hide.
- * Version:           1.1.1
+ * Version:           1.1.2
  * Author:            required+
  * Author URI:        http://required.ch
  * Text Domain:       wp-widget-disable
@@ -33,13 +33,6 @@
  *----------------------------------------------------------------------------*/
 require_once( plugin_dir_path( __FILE__ ) . '/public/class-wp-widget-disable.php' );
 
-/*
- * Register hooks that are fired when the plugin is activated or deactivated.
- * When the plugin is deleted, the uninstall.php file is loaded.
- */
-register_activation_hook( __FILE__, array( 'WP_Widget_Disable', 'activate' ) );
-register_deactivation_hook( __FILE__, array( 'WP_Widget_Disable', 'deactivate' ) );
-
 add_action( 'plugins_loaded', array( 'WP_Widget_Disable', 'get_instance' ) );
 
 /*----------------------------------------------------------------------------*