Fix bordersetting default value set

This commit is contained in:
Amberstone 2025-11-29 01:37:06 +09:00
parent 4adb3b6bcc
commit f00854bcbf
Signed by: amber
GPG key ID: 094B0E55F98D8BF1

View file

@ -623,9 +623,9 @@ class Setting
$key1 = "cs_etc_{$idx}"; $key1 = "cs_etc_{$idx}";
$key2 = "cs_etc_{$idx2}"; $key2 = "cs_etc_{$idx2}";
if (is_array($default) && isset($default[0]) && isset($default[1])) { if (is_array($default) && isset($default[0]) && isset($default[1])) {
if (!isset($this->$key1)) if ($this->$key1 === "" || !isset($this->$key1))
$this->$key1 = array_key_exists($default[0], $options) ? $default[0] : ""; $this->$key1 = array_key_exists($default[0], $options) ? $default[0] : "";
if (!isset($this->$key2)) if ($this->$key2 === "" || !isset($this->$key2))
$this->$key2 = intval($default[1]); $this->$key2 = intval($default[1]);
} }
$options_html = ""; $options_html = "";
@ -665,15 +665,15 @@ class Setting
$key3 = "cs_etc_{$idx3}"; $key3 = "cs_etc_{$idx3}";
if (is_array($default) && isset($default[0]) && isset($default[1])) { if (is_array($default) && isset($default[0]) && isset($default[1])) {
if (!isset($this->$key1)) if ($this->$key1 === "" || !isset($this->$key1))
$this->$key1 = array_key_exists($default[0], $options) ? $default[0] : ""; $this->$key1 = array_key_exists($default[0], $options) ? $default[0] : "";
if (!isset($this->$key2)) if ($this->$key2 === "" || !isset($this->$key2))
$this->$key2 = intval($default[1]); $this->$key2 = intval($default[1]);
} }
if (is_array($default) && isset($default[2])) { if (is_array($default) && isset($default[2])) {
if (!isset($this->$key3)) if ($this->$key3 === "" || !isset($this->$key3))
$this->$key3 = intval($default[2]); $this->$key3 = intval($default[2]);
} }