X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsubst.c;h=2ab6e6b407c04dd3ba83924a4cfd2a31297b13e5;hb=a4ec41fd6e5840659d79f265aca66669df3c341a;hp=6c80802c220f47fbd70a494d8e693b9e0ff002bf;hpb=a5674792eabb60a64631c455e7f217275544dad2;p=citadel.git diff --git a/webcit/subst.c b/webcit/subst.c index 6c80802c2..2ab6e6b40 100644 --- a/webcit/subst.c +++ b/webcit/subst.c @@ -43,6 +43,7 @@ const char EmptyStr[]=""; #define SV_PREEVALUATED 6 + /* * Dynamic content for variable substitution in templates */ @@ -1203,10 +1204,10 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf, } break; case SV_GETTEXT: - if (NewToken->nParameters !=1) { + if ((NewToken->nParameters < 1) || (NewToken->nParameters > 2)) { LogTemplateError( NULL, "Gettext", ERR_NAME, &TP, - "requires exactly 1 parameter, you gave %d params", + "requires 1 or 2 parameter, you gave %d params", NewToken->nParameters); NewToken->Flags = 0; break; @@ -2534,7 +2535,6 @@ void tmpl_do_tabbed(StrBuf *Target, WCTemplputParams *TP) { //// TODO jetzt memcpy (&SubTP, TP, sizeof(WCTemplputParams)); // SubTP.Filter.ControlContextType = ; - StrTabbedDialog(Target, nTabs, TabNames); for (i = 0; i < ntabs; i++) { memset(&TS, 0, sizeof(tab_struct));