Fossil SCM
Make the new wiki MIME type handling more consistent with the existing code.
Commit
0dc1187e7964797108467fae162ca1f1734873fc
Parent
7a14176ee0e6b09…
1 file changed
+3
-2
+3
-2
| --- src/json_wiki.c | ||
| +++ src/json_wiki.c | ||
| @@ -115,13 +115,14 @@ | ||
| 115 | 115 | if( contentFormat>0 ){/*HTML-ize it*/ |
| 116 | 116 | Blob content = empty_blob; |
| 117 | 117 | Blob raw = empty_blob; |
| 118 | 118 | zFormat = "html"; |
| 119 | 119 | if(zBody && *zBody){ |
| 120 | - const char *zMimetype; | |
| 120 | + const char *zMimetype = pWiki->zMimetype; | |
| 121 | + if( zMimetype==0 ) zMimetype = "text/plain"; | |
| 122 | + zMimetype = wiki_filter_mimetypes(zMimetype); | |
| 121 | 123 | blob_append(&raw,zBody,-1); |
| 122 | - zMimetype = wiki_filter_mimetypes(pWiki->zMimetype); | |
| 123 | 124 | if( fossil_strcmp(zMimetype, "text/x-fossil-wiki")==0 ){ |
| 124 | 125 | wiki_convert(&raw,&content,0); |
| 125 | 126 | }else if( fossil_strcmp(zMimetype, "text/x-markdown")==0 ){ |
| 126 | 127 | markdown_to_html(&raw,0,&content); |
| 127 | 128 | }else if( fossil_strcmp(zMimetype, "text/plain")==0 ){ |
| 128 | 129 |
| --- src/json_wiki.c | |
| +++ src/json_wiki.c | |
| @@ -115,13 +115,14 @@ | |
| 115 | if( contentFormat>0 ){/*HTML-ize it*/ |
| 116 | Blob content = empty_blob; |
| 117 | Blob raw = empty_blob; |
| 118 | zFormat = "html"; |
| 119 | if(zBody && *zBody){ |
| 120 | const char *zMimetype; |
| 121 | blob_append(&raw,zBody,-1); |
| 122 | zMimetype = wiki_filter_mimetypes(pWiki->zMimetype); |
| 123 | if( fossil_strcmp(zMimetype, "text/x-fossil-wiki")==0 ){ |
| 124 | wiki_convert(&raw,&content,0); |
| 125 | }else if( fossil_strcmp(zMimetype, "text/x-markdown")==0 ){ |
| 126 | markdown_to_html(&raw,0,&content); |
| 127 | }else if( fossil_strcmp(zMimetype, "text/plain")==0 ){ |
| 128 |
| --- src/json_wiki.c | |
| +++ src/json_wiki.c | |
| @@ -115,13 +115,14 @@ | |
| 115 | if( contentFormat>0 ){/*HTML-ize it*/ |
| 116 | Blob content = empty_blob; |
| 117 | Blob raw = empty_blob; |
| 118 | zFormat = "html"; |
| 119 | if(zBody && *zBody){ |
| 120 | const char *zMimetype = pWiki->zMimetype; |
| 121 | if( zMimetype==0 ) zMimetype = "text/plain"; |
| 122 | zMimetype = wiki_filter_mimetypes(zMimetype); |
| 123 | blob_append(&raw,zBody,-1); |
| 124 | if( fossil_strcmp(zMimetype, "text/x-fossil-wiki")==0 ){ |
| 125 | wiki_convert(&raw,&content,0); |
| 126 | }else if( fossil_strcmp(zMimetype, "text/x-markdown")==0 ){ |
| 127 | markdown_to_html(&raw,0,&content); |
| 128 | }else if( fossil_strcmp(zMimetype, "text/plain")==0 ){ |
| 129 |