69339a3239e9643fbde81b7dd43bc2978a02e13e
hiram
  Wed May 25 10:38:27 2011 -0700
changing uses of cgiServerName to better cgiServerNamePort
diff --git src/hg/lib/wikiLink.c src/hg/lib/wikiLink.c
index c71118e..168b19b 100644
--- src/hg/lib/wikiLink.c
+++ src/hg/lib/wikiLink.c
@@ -49,40 +49,33 @@
 
     if (isNotEmpty(wikiLoggedIn) && isNotEmpty(wikiUserName))
 	{
 	return cloneString(wikiUserName);
 	}
     }
 else
     errAbort("wikiLinkUserName called when wiki is not enabled (specified "
 	     "in hg.conf).");
 return NULL;
 }
 
 static char *encodedHgSessionReturnUrl(int hgsid)
 /* Return a CGI-encoded hgSession URL with hgsid.  Free when done. */
 {
-char *port = NULL;
-port = cgiServerPort();
-
 char retBuf[1024];
-if (differentString(port, "80"))
-    safef(retBuf, sizeof(retBuf), "http://%s:%s/cgi-bin/hgSession?hgsid=%d",
-      cgiServerName(), port, hgsid);
-else
     safef(retBuf, sizeof(retBuf), "http://%s/cgi-bin/hgSession?hgsid=%d",
-      cgiServerName(), hgsid);
+      cgiServerNamePort(), hgsid);
 return cgiEncode(retBuf);
 }
 
 char *wikiLinkUserLoginUrl(int hgsid)
 /* Return the URL for the wiki user login page. */
 {
 char buf[2048];
 char *retEnc = encodedHgSessionReturnUrl(hgsid);
 if (! wikiLinkEnabled())
     errAbort("wikiLinkUserLoginUrl called when wiki is not enabled (specified "
 	     "in hg.conf).");
 safef(buf, sizeof(buf),
       "http://%s/index.php?title=Special:UserloginUCSC&returnto=%s",
       wikiLinkHost(), retEnc);
 freez(&retEnc);