Fossil SCM

Resolved, it seems, skin cookie/query param/--skin flag priority bug which allowed an empty skin= query param to take effect even when --skin was used. Reported in [forum:745cbb55268aff37 | forum post 745cbb55268aff37].

stephan 2021-08-18 21:37 trunk
Commit a9995c561be17dda11f3e6410b1375d9b57ffd2fca02e5befd469cadec8b90dc
1 file changed +1
--- src/skins.c
+++ src/skins.c
@@ -143,10 +143,11 @@
143143
char *skin_use_alternative(const char *zName, int rank){
144144
static int currentRank = 5;
145145
int i;
146146
Blob err = BLOB_INITIALIZER;
147147
if(rank > currentRank) return 0;
148
+ currentRank = rank;
148149
if( zName && 1==rank && strchr(zName, '/')!=0 ){
149150
zAltSkinDir = fossil_strdup(zName);
150151
return 0;
151152
}
152153
if( zName && sqlite3_strglob("draft[1-9]", zName)==0 ){
153154
--- src/skins.c
+++ src/skins.c
@@ -143,10 +143,11 @@
143 char *skin_use_alternative(const char *zName, int rank){
144 static int currentRank = 5;
145 int i;
146 Blob err = BLOB_INITIALIZER;
147 if(rank > currentRank) return 0;
 
148 if( zName && 1==rank && strchr(zName, '/')!=0 ){
149 zAltSkinDir = fossil_strdup(zName);
150 return 0;
151 }
152 if( zName && sqlite3_strglob("draft[1-9]", zName)==0 ){
153
--- src/skins.c
+++ src/skins.c
@@ -143,10 +143,11 @@
143 char *skin_use_alternative(const char *zName, int rank){
144 static int currentRank = 5;
145 int i;
146 Blob err = BLOB_INITIALIZER;
147 if(rank > currentRank) return 0;
148 currentRank = rank;
149 if( zName && 1==rank && strchr(zName, '/')!=0 ){
150 zAltSkinDir = fossil_strdup(zName);
151 return 0;
152 }
153 if( zName && sqlite3_strglob("draft[1-9]", zName)==0 ){
154

Keyboard Shortcuts

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