Fossil SCM
For the "user:" hyperlink in a forum post in "vfx" mode, link to another timeline that is also in "vfx" mode.
Commit
55f9d7b6ecfce6ca9338083877d14d8d10c2a75670e6214b4d032eac44bc2820
Parent
b8ad564dc59cb35…
1 file changed
+6
-1
+6
-1
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -641,11 +641,16 @@ | ||
| 641 | 641 | || zType[0]=='n' || zType[0]=='f'){ |
| 642 | 642 | cgi_printf("artifact: %z%S</a> ",href("%R/info/%!S",zUuid),zUuid); |
| 643 | 643 | } |
| 644 | 644 | |
| 645 | 645 | if( g.perm.Hyperlink && fossil_strcmp(zDispUser, zThisUser)!=0 ){ |
| 646 | - char *zLink = mprintf("%R/timeline?u=%h&c=%t&y=a", zDispUser, zDate); | |
| 646 | + char *zLink; | |
| 647 | + if( zType[0]!='f' || (tmFlags & TIMELINE_FORUMTXT)==0 ){ | |
| 648 | + zLink = mprintf("%R/timeline?u=%h&c=%t&y=a", zDispUser, zDate); | |
| 649 | + }else{ | |
| 650 | + zLink = mprintf("%R/timeline?u=%h&c=%t&y=a&vfx", zDispUser, zDate); | |
| 651 | + } | |
| 647 | 652 | cgi_printf("user: %z%h</a>", href("%z",zLink), zDispUser); |
| 648 | 653 | }else{ |
| 649 | 654 | cgi_printf("user: %h", zDispUser); |
| 650 | 655 | } |
| 651 | 656 | |
| 652 | 657 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -641,11 +641,16 @@ | |
| 641 | || zType[0]=='n' || zType[0]=='f'){ |
| 642 | cgi_printf("artifact: %z%S</a> ",href("%R/info/%!S",zUuid),zUuid); |
| 643 | } |
| 644 | |
| 645 | if( g.perm.Hyperlink && fossil_strcmp(zDispUser, zThisUser)!=0 ){ |
| 646 | char *zLink = mprintf("%R/timeline?u=%h&c=%t&y=a", zDispUser, zDate); |
| 647 | cgi_printf("user: %z%h</a>", href("%z",zLink), zDispUser); |
| 648 | }else{ |
| 649 | cgi_printf("user: %h", zDispUser); |
| 650 | } |
| 651 | |
| 652 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -641,11 +641,16 @@ | |
| 641 | || zType[0]=='n' || zType[0]=='f'){ |
| 642 | cgi_printf("artifact: %z%S</a> ",href("%R/info/%!S",zUuid),zUuid); |
| 643 | } |
| 644 | |
| 645 | if( g.perm.Hyperlink && fossil_strcmp(zDispUser, zThisUser)!=0 ){ |
| 646 | char *zLink; |
| 647 | if( zType[0]!='f' || (tmFlags & TIMELINE_FORUMTXT)==0 ){ |
| 648 | zLink = mprintf("%R/timeline?u=%h&c=%t&y=a", zDispUser, zDate); |
| 649 | }else{ |
| 650 | zLink = mprintf("%R/timeline?u=%h&c=%t&y=a&vfx", zDispUser, zDate); |
| 651 | } |
| 652 | cgi_printf("user: %z%h</a>", href("%z",zLink), zDispUser); |
| 653 | }else{ |
| 654 | cgi_printf("user: %h", zDispUser); |
| 655 | } |
| 656 | |
| 657 |