Fossil SCM
always set private_contact initially to the contact in the user
Commit
136f1441fee982ac62bcc0924d4382ad02b5dca8702bdf7f397dd78b4ca1ac6e
Parent
933a6f3ad8e0fcc…
1 file changed
+2
-4
+2
-4
| --- src/tkt.c | ||
| +++ src/tkt.c | ||
| @@ -1027,15 +1027,13 @@ | ||
| 1027 | 1027 | form_begin(0, "%R/%s", g.zPath); |
| 1028 | 1028 | if( P("date_override") && g.perm.Setup ){ |
| 1029 | 1029 | @ <input type="hidden" name="date_override" value="%h(P("date_override"))"> |
| 1030 | 1030 | } |
| 1031 | 1031 | zScript = ticket_newpage_code(); |
| 1032 | + Th_Store("private_contact", ""); | |
| 1032 | 1033 | if( g.zLogin && g.zLogin[0] ){ |
| 1033 | - int nEmail = 0; | |
| 1034 | - (void)Th_MaybeGetVar(g.interp, "private_contact", &nEmail); | |
| 1035 | - uid = nEmail>0 | |
| 1036 | - ? 0 : db_int(0, "SELECT uid FROM user WHERE login=%Q", g.zLogin); | |
| 1034 | + uid = db_int(0, "SELECT uid FROM user WHERE login=%Q", g.zLogin); | |
| 1037 | 1035 | if( uid ){ |
| 1038 | 1036 | char * zEmail = |
| 1039 | 1037 | db_text(0, "SELECT find_emailaddr(info) FROM user WHERE uid=%d", |
| 1040 | 1038 | uid); |
| 1041 | 1039 | if( zEmail ){ |
| 1042 | 1040 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -1027,15 +1027,13 @@ | |
| 1027 | form_begin(0, "%R/%s", g.zPath); |
| 1028 | if( P("date_override") && g.perm.Setup ){ |
| 1029 | @ <input type="hidden" name="date_override" value="%h(P("date_override"))"> |
| 1030 | } |
| 1031 | zScript = ticket_newpage_code(); |
| 1032 | if( g.zLogin && g.zLogin[0] ){ |
| 1033 | int nEmail = 0; |
| 1034 | (void)Th_MaybeGetVar(g.interp, "private_contact", &nEmail); |
| 1035 | uid = nEmail>0 |
| 1036 | ? 0 : db_int(0, "SELECT uid FROM user WHERE login=%Q", g.zLogin); |
| 1037 | if( uid ){ |
| 1038 | char * zEmail = |
| 1039 | db_text(0, "SELECT find_emailaddr(info) FROM user WHERE uid=%d", |
| 1040 | uid); |
| 1041 | if( zEmail ){ |
| 1042 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -1027,15 +1027,13 @@ | |
| 1027 | form_begin(0, "%R/%s", g.zPath); |
| 1028 | if( P("date_override") && g.perm.Setup ){ |
| 1029 | @ <input type="hidden" name="date_override" value="%h(P("date_override"))"> |
| 1030 | } |
| 1031 | zScript = ticket_newpage_code(); |
| 1032 | Th_Store("private_contact", ""); |
| 1033 | if( g.zLogin && g.zLogin[0] ){ |
| 1034 | uid = db_int(0, "SELECT uid FROM user WHERE login=%Q", g.zLogin); |
| 1035 | if( uid ){ |
| 1036 | char * zEmail = |
| 1037 | db_text(0, "SELECT find_emailaddr(info) FROM user WHERE uid=%d", |
| 1038 | uid); |
| 1039 | if( zEmail ){ |
| 1040 |