Fossil

Check-in [80d5408d]
Login

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

Overview
Comment:(cherry-pick): 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 | branch-1.37
Files: files | file ages | folders
SHA1: 80d5408de17888f1aaf59f97a6d62997a015e30b
User & Date: jan.nijtmans 2017-01-27 12:28:27
Context
2017-01-27
12:30
(cherry-pick): Make "fossil version -v" work again with SQLite 3.15.x, since no-where is documented that "fossil now requires SQLite 3.16" Change VERSION to 1.37.1 (if ever released, this should at least be in it) check-in: e79e4544 user: jan.nijtmans tags: branch-1.37
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
12:27
(cherry-pick): Update the "search" command to honor the -R option. check-in: eab6be7b user: jan.nijtmans tags: branch-1.37
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
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 ){