69b7826e8b8ac5071b038120ab340c8d8e625987 max Wed Jun 14 11:49:03 2017 -0700 fixing hgSession session links on genome-euro not going to genome euro, refs #19623 diff --git src/hg/lib/wikiLink.c src/hg/lib/wikiLink.c index 88480da..b2c033d 100644 --- src/hg/lib/wikiLink.c +++ src/hg/lib/wikiLink.c @@ -529,31 +529,31 @@ return(cloneString(buf)); } char *wikiServerAndCgiDir() /* return the current full absolute URL up to the CGI name, like * http://genome.ucsc.edu/cgi-bin/. If login.relativeLink=on is * set, return only the empty string. Takes care of of non-root location of cgi-bin * and https. Result has to be free'd. */ { boolean relativeLink = cfgOptionBooleanDefault(CFG_LOGIN_RELATIVE, FALSE); if (relativeLink) return cloneString(""); char *cgiDir = cgiScriptDirUrl(); char buf[2048]; -char *hgLoginHost = wikiLinkHost(); +char *hgLoginHost = cgiServerNamePort(); safef(buf, sizeof(buf), "http%s://%s%s", cgiAppendSForHttps(), hgLoginHost, cgiDir); return cloneString(buf); } void wikiFixLogoutLinkWithJs() /* HTTP Basic Auth requires a strange hack to logout. This code prints a script * that fixes an html link with id=logoutLink */ { struct dyString *dy = dyStringNew(4096); // logoutJs.h is a stringified .js file #include "logoutJs.h" dyStringAppend(dy, cdwLogoutJs); dyStringPrintf(dy, "$('#logoutLink').click( function() { logout('/', 'http://cirm.ucsc.edu'); return false; });\n"); jsInline(dy->string);