Fossil SCM
Move change to intended location (shouldn't have been on branch)
Commit
fb6b093d9713506f7d872a6a2e5b64bb00ec324a223d2b4716e4e06f3bbc7da7
Parent
4a53f343024274c…
1 file changed
+3
-3
+3
-3
| --- src/wiki.c | ||
| +++ src/wiki.c | ||
| @@ -2254,18 +2254,18 @@ | ||
| 2254 | 2254 | "SELECT rid FROM tagxref" |
| 2255 | 2255 | " WHERE tagid=(SELECT tagid FROM tag WHERE tagname='wiki-%q/%q')" |
| 2256 | 2256 | " ORDER BY mtime DESC LIMIT 1", |
| 2257 | 2257 | zPrefix, zName |
| 2258 | 2258 | ); |
| 2259 | - if( rid==0 ){ | |
| 2259 | + pWiki = rid==0 ? 0 : manifest_get(rid, CFTYPE_WIKI, 0); | |
| 2260 | + if( pWiki==0 || pWiki->zWiki==0 || pWiki->zWiki[0]==0 ){ | |
| 2260 | 2261 | if( g.perm.WrWiki && g.perm.Write && (mFlags & WIKIASSOC_MENU_WRITE)!=0 ){ |
| 2261 | 2262 | style_submenu_element("Add Wiki", "%R/wikiedit?name=%s/%t", |
| 2262 | 2263 | zPrefix, zName); |
| 2263 | 2264 | } |
| 2265 | + return 0; | |
| 2264 | 2266 | } |
| 2265 | - pWiki = manifest_get(rid, CFTYPE_WIKI, 0); | |
| 2266 | - if( pWiki==0 ) return 0; | |
| 2267 | 2267 | if( fossil_strcmp(pWiki->zMimetype, "text/x-markdown")==0 ){ |
| 2268 | 2268 | Blob tail = BLOB_INITIALIZER; |
| 2269 | 2269 | Blob title = BLOB_INITIALIZER; |
| 2270 | 2270 | Blob markdown; |
| 2271 | 2271 | blob_init(&markdown, pWiki->zWiki, -1); |
| 2272 | 2272 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -2254,18 +2254,18 @@ | |
| 2254 | "SELECT rid FROM tagxref" |
| 2255 | " WHERE tagid=(SELECT tagid FROM tag WHERE tagname='wiki-%q/%q')" |
| 2256 | " ORDER BY mtime DESC LIMIT 1", |
| 2257 | zPrefix, zName |
| 2258 | ); |
| 2259 | if( rid==0 ){ |
| 2260 | if( g.perm.WrWiki && g.perm.Write && (mFlags & WIKIASSOC_MENU_WRITE)!=0 ){ |
| 2261 | style_submenu_element("Add Wiki", "%R/wikiedit?name=%s/%t", |
| 2262 | zPrefix, zName); |
| 2263 | } |
| 2264 | } |
| 2265 | pWiki = manifest_get(rid, CFTYPE_WIKI, 0); |
| 2266 | if( pWiki==0 ) return 0; |
| 2267 | if( fossil_strcmp(pWiki->zMimetype, "text/x-markdown")==0 ){ |
| 2268 | Blob tail = BLOB_INITIALIZER; |
| 2269 | Blob title = BLOB_INITIALIZER; |
| 2270 | Blob markdown; |
| 2271 | blob_init(&markdown, pWiki->zWiki, -1); |
| 2272 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -2254,18 +2254,18 @@ | |
| 2254 | "SELECT rid FROM tagxref" |
| 2255 | " WHERE tagid=(SELECT tagid FROM tag WHERE tagname='wiki-%q/%q')" |
| 2256 | " ORDER BY mtime DESC LIMIT 1", |
| 2257 | zPrefix, zName |
| 2258 | ); |
| 2259 | pWiki = rid==0 ? 0 : manifest_get(rid, CFTYPE_WIKI, 0); |
| 2260 | if( pWiki==0 || pWiki->zWiki==0 || pWiki->zWiki[0]==0 ){ |
| 2261 | if( g.perm.WrWiki && g.perm.Write && (mFlags & WIKIASSOC_MENU_WRITE)!=0 ){ |
| 2262 | style_submenu_element("Add Wiki", "%R/wikiedit?name=%s/%t", |
| 2263 | zPrefix, zName); |
| 2264 | } |
| 2265 | return 0; |
| 2266 | } |
| 2267 | if( fossil_strcmp(pWiki->zMimetype, "text/x-markdown")==0 ){ |
| 2268 | Blob tail = BLOB_INITIALIZER; |
| 2269 | Blob title = BLOB_INITIALIZER; |
| 2270 | Blob markdown; |
| 2271 | blob_init(&markdown, pWiki->zWiki, -1); |
| 2272 |