Fossil SCM
Applied fix from [5244a548] to /json/wiki/list.
Commit
5a568d8b1f38e45e50f0a8e4ca310588c638a7a6687326644dcca51d1555cca0
Parent
a7d8c58d48c0810…
1 file changed
+3
-2
+3
-2
| --- src/json_wiki.c | ||
| +++ src/json_wiki.c | ||
| @@ -458,12 +458,13 @@ | ||
| 458 | 458 | json_set_err(FSL_JSON_E_DENIED, |
| 459 | 459 | "Requires 'j' or 'o' permissions."); |
| 460 | 460 | return NULL; |
| 461 | 461 | } |
| 462 | 462 | blob_append(&sql,"SELECT" |
| 463 | - " substr(tagname,6) as name" | |
| 464 | - " FROM tag WHERE tagname GLOB 'wiki-*'", | |
| 463 | + " DISTINCT substr(tagname,6) as name" | |
| 464 | + " FROM tag JOIN tagxref USING('tagid')" | |
| 465 | + " WHERE tagname GLOB 'wiki-*'", | |
| 465 | 466 | -1); |
| 466 | 467 | zGlob = json_find_option_cstr("glob",NULL,"g"); |
| 467 | 468 | if(zGlob && *zGlob){ |
| 468 | 469 | blob_append_sql(&sql," AND name %s GLOB %Q", |
| 469 | 470 | fInvert ? "NOT" : "", zGlob); |
| 470 | 471 |
| --- src/json_wiki.c | |
| +++ src/json_wiki.c | |
| @@ -458,12 +458,13 @@ | |
| 458 | json_set_err(FSL_JSON_E_DENIED, |
| 459 | "Requires 'j' or 'o' permissions."); |
| 460 | return NULL; |
| 461 | } |
| 462 | blob_append(&sql,"SELECT" |
| 463 | " substr(tagname,6) as name" |
| 464 | " FROM tag WHERE tagname GLOB 'wiki-*'", |
| 465 | -1); |
| 466 | zGlob = json_find_option_cstr("glob",NULL,"g"); |
| 467 | if(zGlob && *zGlob){ |
| 468 | blob_append_sql(&sql," AND name %s GLOB %Q", |
| 469 | fInvert ? "NOT" : "", zGlob); |
| 470 |
| --- src/json_wiki.c | |
| +++ src/json_wiki.c | |
| @@ -458,12 +458,13 @@ | |
| 458 | json_set_err(FSL_JSON_E_DENIED, |
| 459 | "Requires 'j' or 'o' permissions."); |
| 460 | return NULL; |
| 461 | } |
| 462 | blob_append(&sql,"SELECT" |
| 463 | " DISTINCT substr(tagname,6) as name" |
| 464 | " FROM tag JOIN tagxref USING('tagid')" |
| 465 | " WHERE tagname GLOB 'wiki-*'", |
| 466 | -1); |
| 467 | zGlob = json_find_option_cstr("glob",NULL,"g"); |
| 468 | if(zGlob && *zGlob){ |
| 469 | blob_append_sql(&sql," AND name %s GLOB %Q", |
| 470 | fInvert ? "NOT" : "", zGlob); |
| 471 |