* use GetTemplateTokenNumber to retrieve token parameter values; this was one of...

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 8ca14772ba41be4e1fd81866df568df65beefd03..532dfbdee53855f343dcdf3ada70d0db32a420ee 100644 (file)
--- 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 eddddbae180c42f80b5cc93f19d7de838df01c27..609791a977e27fb1f02875b9f74e3770af2a2be0 100644 (file)
--- 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>