Fix: Remove UI hooks when uninstalling the plugin.

It looks like I forgot to move that code when extracting the UI class.
YahnisElsts · Jul 14, 2018 · 98ac494 · 98ac494
1 parent 68f4865
commit 98ac494
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Puc/v4p4/Plugin/Ui.php b/Puc/v4p4/Plugin/Ui.php
@@ -259,5 +259,12 @@ protected function formatManualCheckErrors($errors) {
 
 			return $output;
 		}
+
+		public function removeHooks() {
+			remove_filter('plugin_row_meta', array($this, 'addViewDetailsLink'), 10);
+			remove_filter('plugin_row_meta', array($this, 'addCheckForUpdatesLink'), 10);
+			remove_action('admin_init', array($this, 'handleManualCheck'));
+			remove_action('all_admin_notices', array($this, 'displayManualCheckResult'));
+		}
 	}
 endif;
diff --git a/Puc/v4p4/Plugin/UpdateChecker.php b/Puc/v4p4/Plugin/UpdateChecker.php
@@ -112,14 +112,10 @@ protected function installHooks(){
 		 */
 		public function removeHooks() {
 			parent::removeHooks();
+			$this->extraUi->removeHooks();
 
 			remove_filter('plugins_api', array($this, 'injectInfo'), 20);
-
-			remove_filter('plugin_row_meta', array($this, 'addViewDetailsLink'), 10);
-			remove_filter('plugin_row_meta', array($this, 'addCheckForUpdatesLink'), 10);
-			remove_action('admin_init', array($this, 'handleManualCheck'));
-			remove_action('all_admin_notices', array($this, 'displayManualCheckResult'));
-
+
 			remove_filter('upgrader_post_install', array($this, 'clearCachedVersion'));
 			remove_action('delete_site_transient_update_plugins', array($this, 'clearCachedVersion'));
 		}