Fossil

Check-in [5c90832d79]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix the skin editor so when loading the "Current In Use" skin, it actually pulls in the currently in use skin, even if that skins is an alternative skin specified on the command-line or the built-in default skin.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 5c90832d7980f146411ee891c775b33354bdfbf4380bb89baa4021d5fe2402b9
User & Date: drh 2020-09-06 14:49:24.995
Context
2020-09-07
14:01
file_mkdir() should use the converted filename, not the original. check-in: 45fc083bbf user: drh tags: trunk
2020-09-06
14:49
Fix the skin editor so when loading the "Current In Use" skin, it actually pulls in the currently in use skin, even if that skins is an alternative skin specified on the command-line or the built-in default skin. check-in: 5c90832d79 user: drh tags: trunk
14:37
Disable the ETAG cache for the /draftN pages so that caching does not interfere with preview. check-in: 03643a632c user: drh tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/skins.c.
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705

/*
** Return the text of one of the skin files.
*/
static const char *skin_file_content(const char *zLabel, const char *zFile){
  const char *zResult;
  if( fossil_strcmp(zLabel, "current")==0 ){
    zResult = db_get(zFile, "");
  }else if( sqlite3_strglob("draft[1-9]", zLabel)==0 ){
    zResult = db_get_mprintf("", "%s-%s", zLabel, zFile);
  }else{
    int i;
    for(i=0; i<2; i++){
      char *zKey = mprintf("skins/%s/%s.txt", zLabel, zFile);
      zResult = builtin_text(zKey);







|







691
692
693
694
695
696
697
698
699
700
701
702
703
704
705

/*
** Return the text of one of the skin files.
*/
static const char *skin_file_content(const char *zLabel, const char *zFile){
  const char *zResult;
  if( fossil_strcmp(zLabel, "current")==0 ){
    zResult = skin_get(zFile);
  }else if( sqlite3_strglob("draft[1-9]", zLabel)==0 ){
    zResult = db_get_mprintf("", "%s-%s", zLabel, zFile);
  }else{
    int i;
    for(i=0; i<2; i++){
      char *zKey = mprintf("skins/%s/%s.txt", zLabel, zFile);
      zResult = builtin_text(zKey);