From 42e05311e10d529e42cfd3f84be6a7e94673c9f9 Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Wed, 25 Aug 2010 12:33:13 -0500
Subject: [PATCH] fix upgrade script for config lacking AdminBar

---
 share/upgrades/7.9.12-8.0.0/removeAdminBar.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/upgrades/7.9.12-8.0.0/removeAdminBar.pl b/share/upgrades/7.9.12-8.0.0/removeAdminBar.pl
index 09a64dba8..498159196 100644
--- a/share/upgrades/7.9.12-8.0.0/removeAdminBar.pl
+++ b/share/upgrades/7.9.12-8.0.0/removeAdminBar.pl
@@ -7,7 +7,7 @@ use WebGUI::Asset::Template;
 
 my $removeAdminBar = sub {
     my $macro = shift;
-    if ($macro->{macroPackage} eq 'WebGUI::Macro::AdminBar') {
+    if ($macro->{macro} eq 'AdminBar' || $macro->{macroPackage} eq 'WebGUI::Macro::AdminBar' ) {
         return '';
     }
     else {