Index: src/info.c ================================================================== --- src/info.c +++ src/info.c @@ -2408,11 +2408,11 @@ } zMime = mimetype_from_name(blob_str(&downloadName)); if( zMime ){ if( fossil_strcmp(zMime, "text/html")==0 ){ if( asText ){ - style_submenu_element("Html", "%s", url_render(&url, "txt", 0, 0, 0)); + style_submenu_element("HTML", "%s", url_render(&url, "txt", 0, 0, 0)); }else{ renderAsHtml = 1; style_submenu_element("Text", "%s", url_render(&url, "txt", "1", 0, 0)); } }else if( fossil_strcmp(zMime, "text/x-fossil-wiki")==0 @@ -2423,11 +2423,11 @@ renderAsWiki = 1; style_submenu_element("Text", "%s", url_render(&url, "txt", "1", 0, 0)); } }else if( fossil_strcmp(zMime, "image/svg+xml")==0 ){ if( asText ){ - style_submenu_element("Svg", "%s", url_render(&url, "txt", 0, 0, 0)); + style_submenu_element("SVG", "%s", url_render(&url, "txt", 0, 0, 0)); }else{ renderAsSvg = 1; style_submenu_element("Text", "%s", url_render(&url, "txt", "1", 0, 0)); } } Index: src/wiki.c ================================================================== --- src/wiki.c +++ src/wiki.c @@ -2254,18 +2254,18 @@ "SELECT rid FROM tagxref" " WHERE tagid=(SELECT tagid FROM tag WHERE tagname='wiki-%q/%q')" " ORDER BY mtime DESC LIMIT 1", zPrefix, zName ); - if( rid==0 ){ + pWiki = rid==0 ? 0 : manifest_get(rid, CFTYPE_WIKI, 0); + if( pWiki==0 || pWiki->zWiki==0 || pWiki->zWiki[0]==0 ){ if( g.perm.WrWiki && g.perm.Write && (mFlags & WIKIASSOC_MENU_WRITE)!=0 ){ style_submenu_element("Add Wiki", "%R/wikiedit?name=%s/%t", zPrefix, zName); } + return 0; } - pWiki = manifest_get(rid, CFTYPE_WIKI, 0); - if( pWiki==0 ) return 0; if( fossil_strcmp(pWiki->zMimetype, "text/x-markdown")==0 ){ Blob tail = BLOB_INITIALIZER; Blob title = BLOB_INITIALIZER; Blob markdown; blob_init(&markdown, pWiki->zWiki, -1);