3cd0bb706b3cba77ed64c815f5e9c7c98be89ec8
max
  Tue Jul 9 12:01:12 2013 -0700
forgot one line in merge conflict
diff --git src/hg/hgc/hgc.c src/hg/hgc/hgc.c
index 8e2a3ab..8bf8522 100644
--- src/hg/hgc/hgc.c
+++ src/hg/hgc/hgc.c
@@ -922,31 +922,31 @@
     hFreeConn(&conn);
     }
 }
 
 char *getIdInUrl(struct trackDb *tdb, char *itemName)
 /* If we have an idInUrlSql tag, look up itemName in that, else just
  * return itemName. */
 {
 char *sql = trackDbSetting(tdb, "idInUrlSql");
 char *id = itemName;
 if (sql != NULL)
     {
     char buf[256];
     sqlSafef(buf, sizeof(buf), sql, itemName);
     struct sqlConnection *conn = hAllocConn(database);
-    id = sqlQuickString(conn, query);
+    id = sqlQuickString(conn, bug);
     hFreeConn(&conn);
     }
 return id;
 }
 
 char* replaceInUrl(struct trackDb *tdb, char *url, char *idInUrl, boolean encode) 
 /* replace $$ in url with idInUrl. Supports many other wildchards */
 {
 struct dyString *uUrl = NULL;
 struct dyString *eUrl = NULL;
 char startString[64], endString[64];
 char *ins[9], *outs[9];
 char *eItem = (encode ? cgiEncode(idInUrl) : cloneString(idInUrl));
 
 safef(startString, sizeof startString, "%d", winStart);