Fossil SCM
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.
Commit
5c90832d7980f146411ee891c775b33354bdfbf4380bb89baa4021d5fe2402b9
Parent
03643a632c27788…
1 file changed
+1
-1
+1
-1
| --- src/skins.c | ||
| +++ src/skins.c | ||
| @@ -693,11 +693,11 @@ | ||
| 693 | 693 | ** Return the text of one of the skin files. |
| 694 | 694 | */ |
| 695 | 695 | static const char *skin_file_content(const char *zLabel, const char *zFile){ |
| 696 | 696 | const char *zResult; |
| 697 | 697 | if( fossil_strcmp(zLabel, "current")==0 ){ |
| 698 | - zResult = db_get(zFile, ""); | |
| 698 | + zResult = skin_get(zFile); | |
| 699 | 699 | }else if( sqlite3_strglob("draft[1-9]", zLabel)==0 ){ |
| 700 | 700 | zResult = db_get_mprintf("", "%s-%s", zLabel, zFile); |
| 701 | 701 | }else{ |
| 702 | 702 | int i; |
| 703 | 703 | for(i=0; i<2; i++){ |
| 704 | 704 |
| --- src/skins.c | |
| +++ src/skins.c | |
| @@ -693,11 +693,11 @@ | |
| 693 | ** Return the text of one of the skin files. |
| 694 | */ |
| 695 | static const char *skin_file_content(const char *zLabel, const char *zFile){ |
| 696 | const char *zResult; |
| 697 | if( fossil_strcmp(zLabel, "current")==0 ){ |
| 698 | zResult = db_get(zFile, ""); |
| 699 | }else if( sqlite3_strglob("draft[1-9]", zLabel)==0 ){ |
| 700 | zResult = db_get_mprintf("", "%s-%s", zLabel, zFile); |
| 701 | }else{ |
| 702 | int i; |
| 703 | for(i=0; i<2; i++){ |
| 704 |
| --- src/skins.c | |
| +++ src/skins.c | |
| @@ -693,11 +693,11 @@ | |
| 693 | ** Return the text of one of the skin files. |
| 694 | */ |
| 695 | static const char *skin_file_content(const char *zLabel, const char *zFile){ |
| 696 | const char *zResult; |
| 697 | if( fossil_strcmp(zLabel, "current")==0 ){ |
| 698 | zResult = skin_get(zFile); |
| 699 | }else if( sqlite3_strglob("draft[1-9]", zLabel)==0 ){ |
| 700 | zResult = db_get_mprintf("", "%s-%s", zLabel, zFile); |
| 701 | }else{ |
| 702 | int i; |
| 703 | for(i=0; i<2; i++){ |
| 704 |