From c0d45e0f23e6e36ba9844b0e3b1ea6e19817151a Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 1 Mar 2010 09:58:18 -0800
Subject: [PATCH] Remove workarounds in WeatherData.  Fixes bug #11401.

---
 docs/changelog/7.x.x.txt                |  1 +
 lib/WebGUI/Asset/Wobject/WeatherData.pm | 11 -----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index c38053ef4..977ed7006 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -2,6 +2,7 @@
  - added: Optimized macro parser for perl 5.10
  - fixed #11445: NotifyAboutUsers sends infinite e-mails
  - fixed #11446: Delete a wiki
+ - fixed #11401: Remove hacks in Asset::Wobject::Weather
 
 7.8.13
  - fixed #11418: confusing typ-o in gotcha
diff --git a/lib/WebGUI/Asset/Wobject/WeatherData.pm b/lib/WebGUI/Asset/Wobject/WeatherData.pm
index 8497b9943..2a4b373de 100644
--- a/lib/WebGUI/Asset/Wobject/WeatherData.pm
+++ b/lib/WebGUI/Asset/Wobject/WeatherData.pm
@@ -16,17 +16,6 @@ package WebGUI::Asset::Wobject::WeatherData;
 
 use strict;
 use Weather::Com::Finder;
-BEGIN {
-    # This is horrible, and needs to be removed when Weather::Com > 0.5.3 is released.
-    my $old_get_weather = \&Weather::Com::Base::get_weather;
-    no warnings 'redefine';
-    *Weather::Com::Base::get_weather = sub {
-        my $self = shift;
-        $self->{LINKS} = 1;
-        return $self->$old_get_weather(@_);
-    };
-}
-
 use WebGUI::International;
 use base 'WebGUI::Asset::Wobject';
 use WebGUI::Utility;