diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2025-01-21 23:31:40 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2025-01-21 23:31:40 +0100 |
| commit | 825ccf55562154dc33fbff272384dc5877696208 (patch) | |
| tree | 13afa5c7f5ee19fc29b8ab862d63bd2c9515bd9d | |
| parent | 3fda6f6bf5192c57e10b38f0ff27c915021e36cb (diff) | |
Hide base theme (#7234)
| -rw-r--r-- | .editorconfig | 3 | ||||
| -rw-r--r-- | app/Controllers/extensionController.php | 2 | ||||
| -rw-r--r-- | app/Models/Themes.php | 2 | ||||
| -rw-r--r-- | p/themes/base-theme/README.md | 3 | ||||
| -rw-r--r-- | p/themes/base-theme/metadata.json | 12 |
5 files changed, 12 insertions, 10 deletions
diff --git a/.editorconfig b/.editorconfig index 4f81eb7a0..213804437 100644 --- a/.editorconfig +++ b/.editorconfig @@ -15,6 +15,9 @@ indent_style = tab [*.js] indent_style = tab +[*.json] +indent_style = tab + [*.md] indent_size = 4 indent_style = tab diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php index efaee8534..eb2c3f8d8 100644 --- a/app/Controllers/extensionController.php +++ b/app/Controllers/extensionController.php @@ -90,7 +90,7 @@ class FreshRSS_extension_Controller extends FreshRSS_ActionController { continue 2; } } - if (!in_array($extension['type'], ['system', 'user'], true)) { + if (!in_array($extension['type'], ['system', 'user'], true) || trim($extension['name']) === '') { continue; } /** @var array{name:string,author:string,description:string,version:string,entrypoint:string,type:'system'|'user',url:string,method:string,directory:string} $extension */ diff --git a/app/Models/Themes.php b/app/Models/Themes.php index cd66723bf..033bbe2a0 100644 --- a/app/Models/Themes.php +++ b/app/Models/Themes.php @@ -21,7 +21,7 @@ class FreshRSS_Themes extends Minz_Model { $list = []; foreach ($themes_list as $theme_dir) { $theme = self::get_infos($theme_dir); - if (is_array($theme)) { + if (is_array($theme) && trim($theme['name']) !== '') { $list[$theme_dir] = $theme; } } diff --git a/p/themes/base-theme/README.md b/p/themes/base-theme/README.md index 6cd3f5d1a..2e8f13c43 100644 --- a/p/themes/base-theme/README.md +++ b/p/themes/base-theme/README.md @@ -8,5 +8,4 @@ A base theme for [FreshRSS](https://freshrss.org) 3. Choose your new theme in FreshRSS configuration 4. Enjoy your wonderful theme! -Don’t hesitate to share your theme with us [on GitHub](https://github.com/FreshRSS/FreshRSS/issues) :) - +Don’t hesitate to [share your theme with us](https://github.com/FreshRSS/FreshRSS/discussions/categories/show-and-tell) 🙂 diff --git a/p/themes/base-theme/metadata.json b/p/themes/base-theme/metadata.json index 8abbdc230..5f54e41b0 100644 --- a/p/themes/base-theme/metadata.json +++ b/p/themes/base-theme/metadata.json @@ -1,8 +1,8 @@ { - "name": "", - "author": "Your name", - "description": "A wonderful base theme", - "version": 0.1, - "files": ["frss.css", "base.css"], - "theme-color": "#123456" + "name": "", + "author": "Your name", + "description": "A wonderful base theme", + "version": 0.1, + "files": ["frss.css", "base.css"], + "theme-color": "#123456" } |