From 816e16c59f4fc0b9d8372d9879e6bdf522ed955e Mon Sep 17 00:00:00 2001
From: Japh <japhie@gmail.com>
Date: Tue, 5 Mar 2013 16:24:35 +1100
Subject: [PATCH] Moved uninstall placeholder from hook to uninstall.php

---
 plugin-boilerplate/plugin.php    | 10 ----------
 plugin-boilerplate/uninstall.php | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 plugin-boilerplate/uninstall.php

diff --git a/plugin-boilerplate/plugin.php b/plugin-boilerplate/plugin.php
index f26d0ff..50a0a70 100644
--- a/plugin-boilerplate/plugin.php
+++ b/plugin-boilerplate/plugin.php
@@ -52,7 +52,6 @@ class PluginName {
 		// Register hooks that are fired when the plugin is activated, deactivated, and uninstalled, respectively.
 		register_activation_hook( __FILE__, array( $this, 'activate' ) );
 		register_deactivation_hook( __FILE__, array( $this, 'deactivate' ) );
-		register_uninstall_hook( __FILE__, array( $this, 'uninstall' ) );
 		
 	    /*
 	     * TODO:
@@ -88,15 +87,6 @@ class PluginName {
 		// TODO:	Define deactivation functionality here		
 	} // end deactivate
 	
-	/**
-	 * Fired when the plugin is uninstalled.
-	 *
-	 * @param	boolean	$network_wide	True if WPMU superadmin uses "Network Activate" action, false if WPMU is disabled or plugin is activated on an individual blog 
-	 */
-	public function uninstall( $network_wide ) {
-		// TODO:	Define uninstall functionality here		
-	} // end uninstall
-
 	/**
 	 * Loads the plugin text domain for translation
 	 */
diff --git a/plugin-boilerplate/uninstall.php b/plugin-boilerplate/uninstall.php
new file mode 100644
index 0000000..10c4899
--- /dev/null
+++ b/plugin-boilerplate/uninstall.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Fired when the plugin is uninstalled.
+ */
+
+//if uninstall not called from WordPress exit
+if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) )
+	exit ();
+
+// TODO:	Define uninstall functionality here