Fossil SCM
Bug fix: Show the correct span of a thread on the /forum page.
Commit
b89bfb2a97d0edcd80dfb00ffd6aec13c8960f9d1a82d69d9b73e1a52b601cd7
Parent
63fee24a3a04121…
1 file changed
+3
-2
+3
-2
| --- src/forum.c | ||
| +++ src/forum.c | ||
| @@ -2496,11 +2496,12 @@ | ||
| 2496 | 2496 | " ORDER BY 2 DESC\n" |
| 2497 | 2497 | " LIMIT %d OFFSET %d\n" |
| 2498 | 2498 | ")\n" |
| 2499 | 2499 | "SELECT\n" |
| 2500 | 2500 | " julianday('now') - thread.endtime,\n" /* 0 */ |
| 2501 | - " (SELECT fmtime FROM forumpost WHERE fpid=root),\n" /* 1 */ | |
| 2501 | + " thread.endtime - " | |
| 2502 | + "(SELECT fmtime FROM forumpost WHERE fpid=root),\n" /* 1 */ | |
| 2502 | 2503 | " (SELECT sum(fprev IS NULL) FROM forumpost" |
| 2503 | 2504 | " WHERE froot=root),\n" /* 2 */ |
| 2504 | 2505 | " blob.uuid,\n" /* 3 */ |
| 2505 | 2506 | " substr(event.comment,instr(event.comment,':')+1),\n" /* 4 */ |
| 2506 | 2507 | " thread.lastrid,\n" /* 5 */ |
| @@ -2586,11 +2587,11 @@ | ||
| 2586 | 2587 | @ Awaiting Moderator Approval</span><br> |
| 2587 | 2588 | } |
| 2588 | 2589 | if( nMsg<2 ){ |
| 2589 | 2590 | @ no replies\ |
| 2590 | 2591 | }else{ |
| 2591 | - char *zDuration = human_readable_age(db_column_double(&q,0)); | |
| 2592 | + char *zDuration = human_readable_age(db_column_double(&q,1)); | |
| 2592 | 2593 | @ %d(nMsg) posts spanning %h(zDuration)\ |
| 2593 | 2594 | fossil_free(zDuration); |
| 2594 | 2595 | } |
| 2595 | 2596 | @ </td>\ |
| 2596 | 2597 | if( bShowStatus ){ |
| 2597 | 2598 |
| --- src/forum.c | |
| +++ src/forum.c | |
| @@ -2496,11 +2496,12 @@ | |
| 2496 | " ORDER BY 2 DESC\n" |
| 2497 | " LIMIT %d OFFSET %d\n" |
| 2498 | ")\n" |
| 2499 | "SELECT\n" |
| 2500 | " julianday('now') - thread.endtime,\n" /* 0 */ |
| 2501 | " (SELECT fmtime FROM forumpost WHERE fpid=root),\n" /* 1 */ |
| 2502 | " (SELECT sum(fprev IS NULL) FROM forumpost" |
| 2503 | " WHERE froot=root),\n" /* 2 */ |
| 2504 | " blob.uuid,\n" /* 3 */ |
| 2505 | " substr(event.comment,instr(event.comment,':')+1),\n" /* 4 */ |
| 2506 | " thread.lastrid,\n" /* 5 */ |
| @@ -2586,11 +2587,11 @@ | |
| 2586 | @ Awaiting Moderator Approval</span><br> |
| 2587 | } |
| 2588 | if( nMsg<2 ){ |
| 2589 | @ no replies\ |
| 2590 | }else{ |
| 2591 | char *zDuration = human_readable_age(db_column_double(&q,0)); |
| 2592 | @ %d(nMsg) posts spanning %h(zDuration)\ |
| 2593 | fossil_free(zDuration); |
| 2594 | } |
| 2595 | @ </td>\ |
| 2596 | if( bShowStatus ){ |
| 2597 |
| --- src/forum.c | |
| +++ src/forum.c | |
| @@ -2496,11 +2496,12 @@ | |
| 2496 | " ORDER BY 2 DESC\n" |
| 2497 | " LIMIT %d OFFSET %d\n" |
| 2498 | ")\n" |
| 2499 | "SELECT\n" |
| 2500 | " julianday('now') - thread.endtime,\n" /* 0 */ |
| 2501 | " thread.endtime - " |
| 2502 | "(SELECT fmtime FROM forumpost WHERE fpid=root),\n" /* 1 */ |
| 2503 | " (SELECT sum(fprev IS NULL) FROM forumpost" |
| 2504 | " WHERE froot=root),\n" /* 2 */ |
| 2505 | " blob.uuid,\n" /* 3 */ |
| 2506 | " substr(event.comment,instr(event.comment,':')+1),\n" /* 4 */ |
| 2507 | " thread.lastrid,\n" /* 5 */ |
| @@ -2586,11 +2587,11 @@ | |
| 2587 | @ Awaiting Moderator Approval</span><br> |
| 2588 | } |
| 2589 | if( nMsg<2 ){ |
| 2590 | @ no replies\ |
| 2591 | }else{ |
| 2592 | char *zDuration = human_readable_age(db_column_double(&q,1)); |
| 2593 | @ %d(nMsg) posts spanning %h(zDuration)\ |
| 2594 | fossil_free(zDuration); |
| 2595 | } |
| 2596 | @ </td>\ |
| 2597 | if( bShowStatus ){ |
| 2598 |