mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-01-06 16:58:49 +01:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
ca74667f7e
1 changed files with 3 additions and 3 deletions
|
|
@ -65,14 +65,14 @@ func SetPetalEnabled(name string, enabled bool, frontend string) (ret *Petal, er
|
|||
ret.DisabledInPublish = disabledInPublish
|
||||
ret.DisallowInstall = disallowInstall
|
||||
|
||||
if incompatible {
|
||||
if enabled && incompatible {
|
||||
err = fmt.Errorf(Conf.Language(205))
|
||||
logging.LogInfof("plugin [%s] is incompatible [%s]", name, frontend)
|
||||
return
|
||||
}
|
||||
|
||||
if disallowInstall {
|
||||
msg := "requires upgrading SiYuan to v${x} or later to use"
|
||||
if enabled && disallowInstall {
|
||||
msg := "require upgrade SiYuan to use this plugin [" + name + "]"
|
||||
err = fmt.Errorf(msg)
|
||||
logging.LogInfof(msg)
|
||||
return
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue