From: Wilfried Göesgens <willi@citadel.org>
Date: Thu, 11 Jun 2009 14:51:29 +0000 (+0000)
Subject: * use GetTemplateTokenNumber to retrieve token parameter values; this was one of... 
X-Git-Tag: v7.86~1084
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=39a64988a4833ed289136bf7a25a35774b70092c

* use GetTemplateTokenNumber to retrieve token parameter values; this was one of the nails to our coffin.
---

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 8ca14772b..532dfbdee 100644
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -72,8 +72,11 @@ void doUserIconStylesheet(void) {
 }
 
 int ConditionalIsActiveStylesheet(StrBuf *Target, WCTemplputParams *TP) {
-	long testFor = TP->Tokens->Params[3]->lvalue;
-	int ib_displayas = IconbarIsEnabled("ib_displayas",IB_PICTEXT);
+	long testFor;
+	int ib_displayas;
+
+	testFor = GetTemplateTokenNumber(Target, TP, 3, IB_PICTEXT);
+	ib_displayas = IconbarIsEnabled("ib_displayas", IB_PICTEXT);
 	return (testFor == ib_displayas);
 }
 
diff --git a/webcit/static/t/head.html b/webcit/static/t/head.html
index eddddbae1..609791a97 100644
--- a/webcit/static/t/head.html
+++ b/webcit/static/t/head.html
@@ -12,8 +12,8 @@
 
 <??("COND:LOGGEDIN",1)>
 <link href="user_iconbar" rel="stylesheet" type="text/css">
-<link href="static/iconbaricns.css" rel="<?%("COND:ICONBAR:ACTIVE", 1 , :"", "0", "", "alternate ")>stylesheet" type="text/css" id="style_iconbar_icns" title="Default iconbar">
-<link href="static/iconbarpiconly.css" rel="<?%("COND:ICONBAR:ACTIVE", 1 , :"", 1, "","alternate ")>stylesheet" type="text/css" id="style_iconbar_piconly" title="Iconbar without text">
+<link href="static/iconbaricns.css" rel="<?%("COND:ICONBAR:ACTIVE", 1 , 0, 0, "", "alternate ")>stylesheet" type="text/css" id="style_iconbar_icns" title="Default iconbar">
+<link href="static/iconbarpiconly.css" rel="<?%("COND:ICONBAR:ACTIVE", 1 , 0, 1, "","alternate ")>stylesheet" type="text/css" id="style_iconbar_piconly" title="Iconbar without text">
 <??("X",1)>
 
 <?CSSLOCAL>