b873c49279fd743b4d2e2f8c5cc7e3b45c41e36e larrym Wed Jun 20 15:02:09 2012 -0700 use LOGIN_START/LOGIN_END comments to strip the hgLogin menu item for sites that aren't using hgLogin diff --git src/hg/lib/web.c src/hg/lib/web.c index dda82d0..995b9ec 100644 --- src/hg/lib/web.c +++ src/hg/lib/web.c @@ -1330,18 +1330,21 @@ err = regcomp(&re, buf, REG_EXTENDED); if(err) errAbort("regcomp failed; err: %d", err); struct dyString *dy = newDyString(0); for(offset = 0; offset < len && !regexec(&re, menuStr + offset, ArraySize(match), match, 0); offset += match[0].rm_eo) { dyStringAppendN(dy, menuStr + offset, match[0].rm_eo); if(match[1].rm_so == match[1].rm_eo) dyStringAppend(dy, "?"); dyStringAppend(dy, uiVars); if(match[1].rm_so != match[1].rm_eo) dyStringAppend(dy, "&"); } if(offset < len) dyStringAppend(dy, menuStr + offset); - -return dyStringCannibalize(&dy); +freez(&menuStr); +menuStr = dyStringCannibalize(&dy); +if(!loginSystemEnabled()) + stripRegEx(menuStr, "<\\!-- LOGIN_START -->.*<\\!-- LOGIN_END -->", REG_ICASE); +return menuStr; }