Don't assume that users actually entered a URL to proxy in an HTTP Pr…

…oxy asset. This would be reasonable.
plainblack · Jun 7, 2012 · 6e88016 · 6e88016
1 parent 2cb7c5b
commit 6e88016
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
@@ -18,6 +18,7 @@
  - fixed #12364: Site export loses session info
  - fixed #12345: tickets in trash still show up
  - fixed #12305: dbSlave breaks WebGUI when not able to connect
+ - fixed: Http Proxy assets with no URL to proxy cannot be deleted.
 
 7.10.24
  - fixed #12318: asset error causes asset manager to fail

diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
@@ -299,8 +299,10 @@ See WebGUI::Asset::purgeCache() for details.
 
 sub purgeCache {
 	my $self = shift;
-	WebGUI::Cache->new($self->session,$self->get("proxiedUrl"),"URL")->delete;
-	WebGUI::Cache->new($self->session,$self->get("proxiedUrl"),"HEADER")->delete;
+    if (my $proxiedUrl = $self->get("proxiedUrl")) {
+        WebGUI::Cache->new($self->session,$proxiedUrl,"URL")->delete;
+        WebGUI::Cache->new($self->session,$proxiedUrl,"HEADER")->delete;
+    }
 	$self->SUPER::purgeCache;
 }