From 56c56aaad87b6c27658d82219ec2d4b5dd4cbaee Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Wed, 1 Jul 2009 20:49:27 -0400
Subject: [PATCH] refactor widget init code

---
 plugin-wonderful.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/plugin-wonderful.php b/plugin-wonderful.php
index ac1b185..6e3ea17 100644
--- a/plugin-wonderful.php
+++ b/plugin-wonderful.php
@@ -34,8 +34,15 @@ define('PLUGIN_WONDERFUL_UPDATE_TIME', 60 * 60 * 12); // every 12 hours
 $plugin_wonderful = new PluginWonderful();
 
 function __plugin_wonderful_load_widgets() {
-  if (class_exists('WP_Widget')) {
-    register_widget('PluginWonderfulWidget');
+  global $wp_version, $plugin_wonderful;
+  
+  if (version_compare($wp_version, "2.8", ">=")) {
+    if (class_exists('WP_Widget')) {
+      register_widget('PluginWonderfulWidget');
+    }
+  } else {
+    register_sidebar_widget(__('Plugin Wonderful', 'plugin-wonderful'), array($plugin_wonderful, 'render_pre28_widget'));
+    register_widget_control(__('Plugin Wonderful', 'plugin-wonderful'), array($plugin_wonderful, 'render_pre28_widget_control'));
   }
 }
 
@@ -43,12 +50,7 @@ add_action('admin_menu', array($plugin_wonderful, 'set_up_menu'));
 add_action('init', array($plugin_wonderful, 'init'));
 add_filter('the_excerpt_rss', array($plugin_wonderful, 'insert_rss_feed_ads'));
 add_filter('the_content', array($plugin_wonderful, 'inject_ads_into_body_copy'));
-if (version_compare($wp_version, "2.8", ">=")) {
-  add_action('widgets_init', '__plugin_wonderful_load_widgets');
-} else {
-  register_sidebar_widget(__('Plugin Wonderful', 'plugin-wonderful'), array($plugin_wonderful, 'render_pre28_widget'));
-  register_widget_control(__('Plugin Wonderful', 'plugin-wonderful'), array($plugin_wonderful, 'render_pre28_widget_control'));
-}
+add_action('widgets_init', '__plugin_wonderful_load_widgets');
 
 register_activation_hook(__FILE__, array($plugin_wonderful, 'handle_activation'));