Fossil

Check-in [58dd5383]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:The default MIME type for JSON wiki text should be 'text/x-fossil-wiki', not 'text/plain'.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 58dd5383553a7bc21a71a8751deeb19dcee1c147
User & Date: mistachkin 2017-01-25 01:00:52
Context
2017-01-27
12:28
(cherry-pick): The default MIME type for JSON wiki text should be 'text/x-fossil-wiki', not 'text/plain'. check-in: 80d5408d user: jan.nijtmans tags: branch-1.37
08:57
Openssl 1.0.2j -> 1.0.2k. Whitespace. check-in: 8cb5da6f user: jan.nijtmans tags: trunk
2017-01-25
01:00
The default MIME type for JSON wiki text should be 'text/x-fossil-wiki', not 'text/plain'. check-in: 58dd5383 user: mistachkin tags: trunk
2017-01-19
13:46
Update the "search" command to honor the -R option. check-in: 377fbf2c user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/json_wiki.c.

114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
    }else{
      if( contentFormat>0 ){/*HTML-ize it*/
        Blob content = empty_blob;
        Blob raw = empty_blob;
        zFormat = "html";
        if(zBody && *zBody){
          const char *zMimetype = pWiki->zMimetype;
          if( zMimetype==0 ) zMimetype = "text/plain";
          zMimetype = wiki_filter_mimetypes(zMimetype);
          blob_append(&raw,zBody,-1);
          if( fossil_strcmp(zMimetype, "text/x-fossil-wiki")==0 ){
            wiki_convert(&raw,&content,0);
          }else if( fossil_strcmp(zMimetype, "text/x-markdown")==0 ){
            markdown_to_html(&raw,0,&content);
          }else if( fossil_strcmp(zMimetype, "text/plain")==0 ){







|







114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
    }else{
      if( contentFormat>0 ){/*HTML-ize it*/
        Blob content = empty_blob;
        Blob raw = empty_blob;
        zFormat = "html";
        if(zBody && *zBody){
          const char *zMimetype = pWiki->zMimetype;
          if( zMimetype==0 ) zMimetype = "text/x-fossil-wiki";
          zMimetype = wiki_filter_mimetypes(zMimetype);
          blob_append(&raw,zBody,-1);
          if( fossil_strcmp(zMimetype, "text/x-fossil-wiki")==0 ){
            wiki_convert(&raw,&content,0);
          }else if( fossil_strcmp(zMimetype, "text/x-markdown")==0 ){
            markdown_to_html(&raw,0,&content);
          }else if( fossil_strcmp(zMimetype, "text/plain")==0 ){