Fossil

Differences From Artifact [18eef7b4ab]:

• File src/skins.c — part of check-in [37c290597d] at 2020-08-30 06:05:06 on branch trunk — Add db_unprotect()/db_protect_pop() to /setup_skin_admin when the user selects one of the builtin skins to fix problem reported at [https://fossil-scm.org/forum/forumpost/72a1db2bdc | /forumpost/72a1db2bdc]. (user: stephan size: 35601)

To Artifact [2bc8fd57b2]:

• File src/skins.c — part of check-in [5c90832d79] at 2020-09-06 14:49:24 on branch trunk — 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. (user: drh size: 35599)

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);