From 204108e178d3fbdb5996a0e6f9b0f50534da0978 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 27 Jun 2011 18:06:23 -0700
Subject: [PATCH] Remove the Underground User style template, and fix the
 problem is tried to fix by changing the navigation.  Fixes bug #12172

---
 docs/changelog/7.x.x.txt                        |   1 +
 .../style-underground_top-navigation.wgpkg      | Bin 0 -> 953 bytes
 docs/upgrades/upgrade_7.10.18-7.10.19.pl        |  16 ++++++++++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 docs/upgrades/packages-7.10.19/style-underground_top-navigation.wgpkg

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 1e227b391..b9e91d82e 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -4,6 +4,7 @@
  - Allow specific expirations for groups in userImport.pl
  - fixed #12164: Calendar feeds with tons of ;adminId=XXXXXX added
  - fixed #12167: Calendar Next/Prev Month/Year confusion
+ - fixed #12172: Underground User Style template shows up in Style wizard during site creation
 
 7.10.18
  - fixed #12138: Version tag gets create by entering and direct leaving
diff --git a/docs/upgrades/packages-7.10.19/style-underground_top-navigation.wgpkg b/docs/upgrades/packages-7.10.19/style-underground_top-navigation.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..96c6cc18942cb9239164ddac17e5553d604034d9
GIT binary patch
literal 953
zcmV;q14jHGiwFP!00000|Ls;?bJ{o*^>cm&<L6CcVT>_vq)QXh6ucACbhES55w>bn
zjHF63#NFwCuOt&B2-(@0Ei-+H9&C?wKaTD_=h|o9@mCN8aU6MG5P&!e^gRHbj_0+u
zEARm52JLn`?6f1V1wa6R*HSLWUzL!MD@YkFF<HEvuM&uhm$&ty)G~)N_kS_{m9`9O
zV6RcvJV(u&voC^@{|#5g>ULGXU+90>iMo6J@5Eu(YpH4;e;up;XUB*BGcx>hqD1Hm
zNjWT#-|Dyi`ujKYigC&imlz5C)|eT~IbGio#_<Z5s6ctD+>C`E_{LEi<yf#1)>AA?
z6VnHFFXISGlwZ_3tRLEq5(+tdWR$DjfeA^fvfRcLD)AN0b3_iNR4SHDE>_J-EaoV;
zp$S^wW0KRg$>{(UHK9!4=h@Js<nRi?d<qMZ!fc_!DZD#~=$asYr^dp_?73&zaew9r
zg+OxSL{2~OPwV1wvRLD*O9{xeq{-SsH@0F*M<gq&yg6ZxM21KXi4@kb;-xvAkadYp
zE0QB#aH{U-lCo0*SGa%@Q(`@^XzFR)oDN};aw@5;S(DDGmyXCr`7p=QcscE}poSz*
zDJG4D6W1V{qNSpSM4RJJ@b!3|f?`l+E7<!~PvlLf7&sWo9C0k~c=?voWePdk#C1UF
z%p5awxcwe!*4)-YBISF4sD?Ff=8z~RA7CUVXrl_hnTPheJ0~sROwm}3;j$^+J(^wK
zjr#q8?s&g{PiJ3HrXI!z+M)UXp62*7Zn)-yFi6^<*GoD!{1PwG^r<mY(d>LKm!;j8
zTggo+YaL3nY2gQq8a2e$8Ila?NwCwvD6$4iI#a5@)ePI~V|pP~Url+om#)(zvA}Fh
zr8->JuuzNN-B<FhnmGcQ8a*plzDq<ZJ4;?Vm{H0t{?=4JOdM`vaYMC)n-=eg*kypB
zbdtnL62)x?97iiGlyrW78Zq0>?Bvj6VoMiWH1*@q43MXBV$wL_6**l=gvq<{$0)q$
zkUy^n^=Jsns`v1Rji>)t<dy@1p-fj*Da4u}lJS~JP5EcZV6l;2()&7mJDI{H&C_>-
z`-eq*8ODVTf<+^o{RpNSPqlQ19v02`hO_5W-+;DL;oPP%--Dgvw&O4e+dCa#M)(`x
z1M!)O2@{v!9^TB7W&FN=Oe<$(DuC)&O%=UBH<Yq{{Oa39q{jFkc?<yX^%wE`$@i0=
b@x^_O@mhh`3cOa}*Qme`1pM6z01yBGR@C0W

literal 0
HcmV?d00001

diff --git a/docs/upgrades/upgrade_7.10.18-7.10.19.pl b/docs/upgrades/upgrade_7.10.18-7.10.19.pl
index 434bdf18d..77dd98cb7 100644
--- a/docs/upgrades/upgrade_7.10.18-7.10.19.pl
+++ b/docs/upgrades/upgrade_7.10.18-7.10.19.pl
@@ -35,6 +35,7 @@ my $session = start(); # this line required
 # upgrade functions go here
 addTicketLimitToBadgeGroup( $session );
 fixBrokenCalendarFeedUrls ( $session );
+removeUndergroundUserStyleTemplate ( $session );
 
 finish($session); # this line required
 
@@ -67,6 +68,21 @@ sub fixBrokenCalendarFeedUrls {
     print "DONE!\n" unless $quiet;
 }
 
+#----------------------------------------------------------------------------
+# Add a ticket limit to badges in a badge group
+sub removeUndergroundUserStyleTemplate {
+    my $session = shift;
+    print "\tRemove Underground User Style template... " unless $quiet;
+    if ($session->setting->get('userFunctionStyleId') eq 'zfDnOJgeiybz9vnmoEXRXA') {
+        $session->setting->set('userFunctionStyleId', 'Qk24uXao2yowR6zxbVJ0xA');
+    }
+    my $underground_user = WebGUI::Asset->newByDynamicClass($session, 'zfDnOJgeiybz9vnmoEXRXA');
+    if ($underground_user) {
+        $underground_user->purge;
+    }
+    print "DONE!\n" unless $quiet;
+}
+
 #----------------------------------------------------------------------------
 # Add a ticket limit to badges in a badge group
 sub addTicketLimitToBadgeGroup {