Fossil SCM
Fix the /info page to take the mimetype into account when rendering the parsed display of wiki artifacts.
Commit
bfe726f64c17d49678c93d9ac4a36a35252b9f87
Parent
2656695db13d983…
1 file changed
+4
-1
+4
-1
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -827,10 +827,13 @@ | ||
| 827 | 827 | @ <tr><th>Page Name:</th><td>%h(pWiki->zWikiTitle)</td></tr> |
| 828 | 828 | @ <tr><th>Date:</th><td> |
| 829 | 829 | hyperlink_to_date(zDate, "</td></tr>"); |
| 830 | 830 | @ <tr><th>Original User:</th><td> |
| 831 | 831 | hyperlink_to_user(pWiki->zUser, zDate, "</td></tr>"); |
| 832 | + if( pWiki->zMimetype ){ | |
| 833 | + @ <tr><th>Mimetype:</th><td>%h(pWiki->zMimetype)</td></tr> | |
| 834 | + } | |
| 832 | 835 | if( pWiki->nParent>0 ){ |
| 833 | 836 | int i; |
| 834 | 837 | @ <tr><th>Parent%s(pWiki->nParent==1?"":"s"):</th><td> |
| 835 | 838 | for(i=0; i<pWiki->nParent; i++){ |
| 836 | 839 | char *zParent = pWiki->azParent[i]; |
| @@ -854,11 +857,11 @@ | ||
| 854 | 857 | } |
| 855 | 858 | |
| 856 | 859 | |
| 857 | 860 | @ <div class="section">Content</div> |
| 858 | 861 | blob_init(&wiki, pWiki->zWiki, -1); |
| 859 | - wiki_convert(&wiki, 0, 0); | |
| 862 | + wiki_render_by_mimetype(&wiki, pWiki->zMimetype); | |
| 860 | 863 | blob_reset(&wiki); |
| 861 | 864 | manifest_destroy(pWiki); |
| 862 | 865 | style_footer(); |
| 863 | 866 | } |
| 864 | 867 | |
| 865 | 868 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -827,10 +827,13 @@ | |
| 827 | @ <tr><th>Page Name:</th><td>%h(pWiki->zWikiTitle)</td></tr> |
| 828 | @ <tr><th>Date:</th><td> |
| 829 | hyperlink_to_date(zDate, "</td></tr>"); |
| 830 | @ <tr><th>Original User:</th><td> |
| 831 | hyperlink_to_user(pWiki->zUser, zDate, "</td></tr>"); |
| 832 | if( pWiki->nParent>0 ){ |
| 833 | int i; |
| 834 | @ <tr><th>Parent%s(pWiki->nParent==1?"":"s"):</th><td> |
| 835 | for(i=0; i<pWiki->nParent; i++){ |
| 836 | char *zParent = pWiki->azParent[i]; |
| @@ -854,11 +857,11 @@ | |
| 854 | } |
| 855 | |
| 856 | |
| 857 | @ <div class="section">Content</div> |
| 858 | blob_init(&wiki, pWiki->zWiki, -1); |
| 859 | wiki_convert(&wiki, 0, 0); |
| 860 | blob_reset(&wiki); |
| 861 | manifest_destroy(pWiki); |
| 862 | style_footer(); |
| 863 | } |
| 864 | |
| 865 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -827,10 +827,13 @@ | |
| 827 | @ <tr><th>Page Name:</th><td>%h(pWiki->zWikiTitle)</td></tr> |
| 828 | @ <tr><th>Date:</th><td> |
| 829 | hyperlink_to_date(zDate, "</td></tr>"); |
| 830 | @ <tr><th>Original User:</th><td> |
| 831 | hyperlink_to_user(pWiki->zUser, zDate, "</td></tr>"); |
| 832 | if( pWiki->zMimetype ){ |
| 833 | @ <tr><th>Mimetype:</th><td>%h(pWiki->zMimetype)</td></tr> |
| 834 | } |
| 835 | if( pWiki->nParent>0 ){ |
| 836 | int i; |
| 837 | @ <tr><th>Parent%s(pWiki->nParent==1?"":"s"):</th><td> |
| 838 | for(i=0; i<pWiki->nParent; i++){ |
| 839 | char *zParent = pWiki->azParent[i]; |
| @@ -854,11 +857,11 @@ | |
| 857 | } |
| 858 | |
| 859 | |
| 860 | @ <div class="section">Content</div> |
| 861 | blob_init(&wiki, pWiki->zWiki, -1); |
| 862 | wiki_render_by_mimetype(&wiki, pWiki->zMimetype); |
| 863 | blob_reset(&wiki); |
| 864 | manifest_destroy(pWiki); |
| 865 | style_footer(); |
| 866 | } |
| 867 | |
| 868 |