Fossil SCM

Merge changes from trunk.

drh 2020-08-24 00:24 sec2020 merge
Commit 4a8bc878f03b3bfef427800ff4a92f2df82eb6b4d2532009a30fdc92a1daaf5e
Parent 26ac4b1ccfb0d82…
7 files changed +2 -1 +2 -1 +2 -1 +3 +3 +2 -1 +2
~ src/backlink.c ~ src/configure.c ~ src/configure.c ~ src/manifest.c ~ src/manifest.c ~ src/wiki.c ~ www/changes.wiki
M src/backlink.c
+2 -1
--- src/backlink.c
+++ src/backlink.c
@@ -169,11 +169,12 @@
169169
 rid = db_int(0, "SELECT rid FROM tagxref WHERE tagid=%d"
170170
 " ORDER BY mtime DESC LIMIT 1", tagid);
171171
 if( rid==0 ) return;
172172
 pWiki = manifest_get(rid, CFTYPE_WIKI, 0);
173173
 if( pWiki ){
174
- backlink_extract(pWiki->zWiki, pWiki->zMimetype, tagid, 2, pWiki->rDate,1);
174
+ backlink_extract(pWiki->zWiki, pWiki->zMimetype, tagid, BKLNK_WIKI,
175
+ pWiki->rDate, 1);
175176
 manifest_destroy(pWiki);
176177
 }
177178
 }
178179
179180
 /*
180181
--- src/backlink.c
+++ src/backlink.c
@@ -169,11 +169,12 @@
169 rid = db_int(0, "SELECT rid FROM tagxref WHERE tagid=%d"
170 " ORDER BY mtime DESC LIMIT 1", tagid);
171 if( rid==0 ) return;
172 pWiki = manifest_get(rid, CFTYPE_WIKI, 0);
173 if( pWiki ){
174 backlink_extract(pWiki->zWiki, pWiki->zMimetype, tagid, 2, pWiki->rDate,1);
 
175 manifest_destroy(pWiki);
176 }
177 }
178
179 /*
180
--- src/backlink.c
+++ src/backlink.c
@@ -169,11 +169,12 @@
169 rid = db_int(0, "SELECT rid FROM tagxref WHERE tagid=%d"
170 " ORDER BY mtime DESC LIMIT 1", tagid);
171 if( rid==0 ) return;
172 pWiki = manifest_get(rid, CFTYPE_WIKI, 0);
173 if( pWiki ){
174 backlink_extract(pWiki->zWiki, pWiki->zMimetype, tagid, BKLNK_WIKI,
175 pWiki->rDate, 1);
176 manifest_destroy(pWiki);
177 }
178 }
179
180 /*
181
M src/configure.c
+2 -1
--- src/configure.c
+++ src/configure.c
@@ -732,11 +732,12 @@
732732
 ** > fossil configuration export AREA FILENAME
733733
 **
734734
 ** Write to FILENAME exported configuration information for AREA.
735735
 ** AREA can be one of:
736736
 **
737
-** all email project shun skin ticket user alias subscriber
737
+** all email interwiki project shun skin
738
+** ticket user alias subscriber
738739
 **
739740
 ** > fossil configuration import FILENAME
740741
 **
741742
 ** Read a configuration from FILENAME, overwriting the current
742743
 ** configuration.
743744
--- src/configure.c
+++ src/configure.c
@@ -732,11 +732,12 @@
732 ** > fossil configuration export AREA FILENAME
733 **
734 ** Write to FILENAME exported configuration information for AREA.
735 ** AREA can be one of:
736 **
737 ** all email project shun skin ticket user alias subscriber
 
738 **
739 ** > fossil configuration import FILENAME
740 **
741 ** Read a configuration from FILENAME, overwriting the current
742 ** configuration.
743
--- src/configure.c
+++ src/configure.c
@@ -732,11 +732,12 @@
732 ** > fossil configuration export AREA FILENAME
733 **
734 ** Write to FILENAME exported configuration information for AREA.
735 ** AREA can be one of:
736 **
737 ** all email interwiki project shun skin
738 ** ticket user alias subscriber
739 **
740 ** > fossil configuration import FILENAME
741 **
742 ** Read a configuration from FILENAME, overwriting the current
743 ** configuration.
744
M src/configure.c
+2 -1
--- src/configure.c
+++ src/configure.c
@@ -732,11 +732,12 @@
732732
 ** > fossil configuration export AREA FILENAME
733733
 **
734734
 ** Write to FILENAME exported configuration information for AREA.
735735
 ** AREA can be one of:
736736
 **
737
-** all email project shun skin ticket user alias subscriber
737
+** all email interwiki project shun skin
738
+** ticket user alias subscriber
738739
 **
739740
 ** > fossil configuration import FILENAME
740741
 **
741742
 ** Read a configuration from FILENAME, overwriting the current
742743
 ** configuration.
743744
--- src/configure.c
+++ src/configure.c
@@ -732,11 +732,12 @@
732 ** > fossil configuration export AREA FILENAME
733 **
734 ** Write to FILENAME exported configuration information for AREA.
735 ** AREA can be one of:
736 **
737 ** all email project shun skin ticket user alias subscriber
 
738 **
739 ** > fossil configuration import FILENAME
740 **
741 ** Read a configuration from FILENAME, overwriting the current
742 ** configuration.
743
--- src/configure.c
+++ src/configure.c
@@ -732,11 +732,12 @@
732 ** > fossil configuration export AREA FILENAME
733 **
734 ** Write to FILENAME exported configuration information for AREA.
735 ** AREA can be one of:
736 **
737 ** all email interwiki project shun skin
738 ** ticket user alias subscriber
739 **
740 ** > fossil configuration import FILENAME
741 **
742 ** Read a configuration from FILENAME, overwriting the current
743 ** configuration.
744
M src/manifest.c
+3
--- src/manifest.c
+++ src/manifest.c
@@ -2676,10 +2676,13 @@
26762676
 "VALUES('f',%.17g,%d,%Q,'%q: %q')",
26772677
 p->rDate, rid, p->zUser, zFType, zTitle
26782678
 );
26792679
 fossil_free(zTitle);
26802680
 }
2681
+ if( p->zWiki[0] ){
2682
+ backlink_extract(p->zWiki, p->zMimetype, rid, BKLNK_FORUM, p->rDate, 1);
2683
+ }
26812684
 }
26822685
 db_end_transaction(0);
26832686
 if( permitHooks ){
26842687
 rc = xfer_run_common_script();
26852688
 if( rc==TH_OK ){
26862689
--- src/manifest.c
+++ src/manifest.c
@@ -2676,10 +2676,13 @@
2676 "VALUES('f',%.17g,%d,%Q,'%q: %q')",
2677 p->rDate, rid, p->zUser, zFType, zTitle
2678 );
2679 fossil_free(zTitle);
2680 }
 
 
 
2681 }
2682 db_end_transaction(0);
2683 if( permitHooks ){
2684 rc = xfer_run_common_script();
2685 if( rc==TH_OK ){
2686
--- src/manifest.c
+++ src/manifest.c
@@ -2676,10 +2676,13 @@
2676 "VALUES('f',%.17g,%d,%Q,'%q: %q')",
2677 p->rDate, rid, p->zUser, zFType, zTitle
2678 );
2679 fossil_free(zTitle);
2680 }
2681 if( p->zWiki[0] ){
2682 backlink_extract(p->zWiki, p->zMimetype, rid, BKLNK_FORUM, p->rDate, 1);
2683 }
2684 }
2685 db_end_transaction(0);
2686 if( permitHooks ){
2687 rc = xfer_run_common_script();
2688 if( rc==TH_OK ){
2689
M src/manifest.c
+3
--- src/manifest.c
+++ src/manifest.c
@@ -2676,10 +2676,13 @@
26762676
 "VALUES('f',%.17g,%d,%Q,'%q: %q')",
26772677
 p->rDate, rid, p->zUser, zFType, zTitle
26782678
 );
26792679
 fossil_free(zTitle);
26802680
 }
2681
+ if( p->zWiki[0] ){
2682
+ backlink_extract(p->zWiki, p->zMimetype, rid, BKLNK_FORUM, p->rDate, 1);
2683
+ }
26812684
 }
26822685
 db_end_transaction(0);
26832686
 if( permitHooks ){
26842687
 rc = xfer_run_common_script();
26852688
 if( rc==TH_OK ){
26862689
--- src/manifest.c
+++ src/manifest.c
@@ -2676,10 +2676,13 @@
2676 "VALUES('f',%.17g,%d,%Q,'%q: %q')",
2677 p->rDate, rid, p->zUser, zFType, zTitle
2678 );
2679 fossil_free(zTitle);
2680 }
 
 
 
2681 }
2682 db_end_transaction(0);
2683 if( permitHooks ){
2684 rc = xfer_run_common_script();
2685 if( rc==TH_OK ){
2686
--- src/manifest.c
+++ src/manifest.c
@@ -2676,10 +2676,13 @@
2676 "VALUES('f',%.17g,%d,%Q,'%q: %q')",
2677 p->rDate, rid, p->zUser, zFType, zTitle
2678 );
2679 fossil_free(zTitle);
2680 }
2681 if( p->zWiki[0] ){
2682 backlink_extract(p->zWiki, p->zMimetype, rid, BKLNK_FORUM, p->rDate, 1);
2683 }
2684 }
2685 db_end_transaction(0);
2686 if( permitHooks ){
2687 rc = xfer_run_common_script();
2688 if( rc==TH_OK ){
2689
M src/wiki.c
+2 -1
--- src/wiki.c
+++ src/wiki.c
@@ -1004,11 +1004,12 @@
10041004
 Stmt q = empty_Stmt;
10051005
 int n = 0;
10061006
 db_begin_transaction();
10071007
 db_prepare(&q, "SELECT"
10081008
 " substr(tagname,6) AS name"
1009
- " FROM tag WHERE tagname GLOB 'wiki-*'"
1009
+ " FROM tag JOIN tagxref USING('tagid')"
1010
+ " WHERE tagname GLOB 'wiki-*'"
10101011
 " UNION SELECT 'Sandbox' AS name"
10111012
 " ORDER BY name COLLATE NOCASE");
10121013
 CX("[");
10131014
 while( SQLITE_ROW==db_step(&q) ){
10141015
 char const * zName = db_column_text(&q,0);
10151016
--- src/wiki.c
+++ src/wiki.c
@@ -1004,11 +1004,12 @@
1004 Stmt q = empty_Stmt;
1005 int n = 0;
1006 db_begin_transaction();
1007 db_prepare(&q, "SELECT"
1008 " substr(tagname,6) AS name"
1009 " FROM tag WHERE tagname GLOB 'wiki-*'"
 
1010 " UNION SELECT 'Sandbox' AS name"
1011 " ORDER BY name COLLATE NOCASE");
1012 CX("[");
1013 while( SQLITE_ROW==db_step(&q) ){
1014 char const * zName = db_column_text(&q,0);
1015
--- src/wiki.c
+++ src/wiki.c
@@ -1004,11 +1004,12 @@
1004 Stmt q = empty_Stmt;
1005 int n = 0;
1006 db_begin_transaction();
1007 db_prepare(&q, "SELECT"
1008 " substr(tagname,6) AS name"
1009 " FROM tag JOIN tagxref USING('tagid')"
1010 " WHERE tagname GLOB 'wiki-*'"
1011 " UNION SELECT 'Sandbox' AS name"
1012 " ORDER BY name COLLATE NOCASE");
1013 CX("[");
1014 while( SQLITE_ROW==db_step(&q) ){
1015 char const * zName = db_column_text(&q,0);
1016
M www/changes.wiki
+2
--- www/changes.wiki
+++ www/changes.wiki
@@ -2,10 +2,12 @@
22
33
 <a name='v2_13'></a>
44
 <h2>Changes for Version 2.13 (pending)</h2>
55
66
 * Added support for [./interwiki.md|interwiki links].
7
+ * Enable &lt;del&gt; and &lt;ins&gt; markup in wiki.
8
+ * Improvements to the Forum threading display.
79
810
 <a name='v2_12'></a>
911
 <h2>Changes for Version 2.12.1 (2020-08-20)</h2>
1012
1113
 * (2.12.1): Fix client-side vulnerabilities discovered by Max Justicz.
1214
--- www/changes.wiki
+++ www/changes.wiki
@@ -2,10 +2,12 @@
2
3 <a name='v2_13'></a>
4 <h2>Changes for Version 2.13 (pending)</h2>
5
6 * Added support for [./interwiki.md|interwiki links].
 
 
7
8 <a name='v2_12'></a>
9 <h2>Changes for Version 2.12.1 (2020-08-20)</h2>
10
11 * (2.12.1): Fix client-side vulnerabilities discovered by Max Justicz.
12
--- www/changes.wiki
+++ www/changes.wiki
@@ -2,10 +2,12 @@
2
3 <a name='v2_13'></a>
4 <h2>Changes for Version 2.13 (pending)</h2>
5
6 * Added support for [./interwiki.md|interwiki links].
7 * Enable &lt;del&gt; and &lt;ins&gt; markup in wiki.
8 * Improvements to the Forum threading display.
9
10 <a name='v2_12'></a>
11 <h2>Changes for Version 2.12.1 (2020-08-20)</h2>
12
13 * (2.12.1): Fix client-side vulnerabilities discovered by Max Justicz.
14

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button