065a7b2212a43e967bbed86127c94949c0835932
hiram
  Wed Mar 23 10:17:44 2011 -0700
adding server port to returnto string for genomewiki login
diff --git src/hg/lib/wikiLink.c src/hg/lib/wikiLink.c
index 4c54366..c71118e 100644
--- src/hg/lib/wikiLink.c
+++ src/hg/lib/wikiLink.c
@@ -49,31 +49,38 @@
 
     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);
 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",