Fossil SCM
Fixes to the new markdown hyperlink logic to handle the case there the target URL is not defined.
Commit
44545eef88e825305798672ea0760c40804e8d7f1d2bb8d0d35dac42805eb9f7
Parent
774fb7712fb43fe…
1 file changed
+7
-3
+7
-3
| --- src/markdown_html.c | ||
| +++ src/markdown_html.c | ||
| @@ -429,14 +429,18 @@ | ||
| 429 | 429 | void *opaque |
| 430 | 430 | ){ |
| 431 | 431 | char *zLink = blob_buffer(link); |
| 432 | 432 | char *zTitle = title!=0 && blob_size(title)>0 ? blob_str(title) : 0; |
| 433 | 433 | char zClose[20]; |
| 434 | - | |
| 435 | - wiki_resolve_hyperlink(ob, 0, zLink, zClose, sizeof(zClose), 0, zTitle); | |
| 434 | + | |
| 435 | + if( zLink==0 || zLink[0]==0 ){ | |
| 436 | + zClose[0] = 0; | |
| 437 | + }else{ | |
| 438 | + wiki_resolve_hyperlink(ob, 0, zLink, zClose, sizeof(zClose), 0, zTitle); | |
| 439 | + } | |
| 436 | 440 | if( blob_size(content)==0 ){ |
| 437 | - BLOB_APPEND_BLOB(ob, link); | |
| 441 | + if( link ) BLOB_APPEND_BLOB(ob, link); | |
| 438 | 442 | }else{ |
| 439 | 443 | BLOB_APPEND_BLOB(ob, content); |
| 440 | 444 | } |
| 441 | 445 | blob_append(ob, zClose, -1); |
| 442 | 446 | return 1; |
| 443 | 447 |
| --- src/markdown_html.c | |
| +++ src/markdown_html.c | |
| @@ -429,14 +429,18 @@ | |
| 429 | void *opaque |
| 430 | ){ |
| 431 | char *zLink = blob_buffer(link); |
| 432 | char *zTitle = title!=0 && blob_size(title)>0 ? blob_str(title) : 0; |
| 433 | char zClose[20]; |
| 434 | |
| 435 | wiki_resolve_hyperlink(ob, 0, zLink, zClose, sizeof(zClose), 0, zTitle); |
| 436 | if( blob_size(content)==0 ){ |
| 437 | BLOB_APPEND_BLOB(ob, link); |
| 438 | }else{ |
| 439 | BLOB_APPEND_BLOB(ob, content); |
| 440 | } |
| 441 | blob_append(ob, zClose, -1); |
| 442 | return 1; |
| 443 |
| --- src/markdown_html.c | |
| +++ src/markdown_html.c | |
| @@ -429,14 +429,18 @@ | |
| 429 | void *opaque |
| 430 | ){ |
| 431 | char *zLink = blob_buffer(link); |
| 432 | char *zTitle = title!=0 && blob_size(title)>0 ? blob_str(title) : 0; |
| 433 | char zClose[20]; |
| 434 | |
| 435 | if( zLink==0 || zLink[0]==0 ){ |
| 436 | zClose[0] = 0; |
| 437 | }else{ |
| 438 | wiki_resolve_hyperlink(ob, 0, zLink, zClose, sizeof(zClose), 0, zTitle); |
| 439 | } |
| 440 | if( blob_size(content)==0 ){ |
| 441 | if( link ) BLOB_APPEND_BLOB(ob, link); |
| 442 | }else{ |
| 443 | BLOB_APPEND_BLOB(ob, content); |
| 444 | } |
| 445 | blob_append(ob, zClose, -1); |
| 446 | return 1; |
| 447 |