diff --git a/kernel/dblanguage.class.php b/kernel/dblanguage.class.php index c1cdeeea..21f3cabb 100644 --- a/kernel/dblanguage.class.php +++ b/kernel/dblanguage.class.php @@ -15,7 +15,7 @@ class dbLanguage extends dbJSON if(file_exists($filename)) { $Tmp = new dbJSON($filename, false); - $this->db += $Tmp->db; + $this->db = array_merge($this->db, $Tmp->db); } // User language @@ -23,7 +23,7 @@ class dbLanguage extends dbJSON if(file_exists($filename)) { $Tmp = new dbJSON($filename, false); - $this->db += $Tmp->db; + $this->db = array_merge($this->db, $Tmp->db); } $this->data = $this->db['language-data']; @@ -57,7 +57,7 @@ class dbLanguage extends dbJSON public function add($array) { - $this->db += $array; + $this->db = array_merge($this->db, $array); } // Returns the item from plugin-data. diff --git a/languages/ru_RU.json b/languages/ru_RU.json index 0145406a..11a11fe1 100644 --- a/languages/ru_RU.json +++ b/languages/ru_RU.json @@ -77,7 +77,7 @@ "plugins": "Плагины", "install-plugin": "Установить плагин", "uninstall-plugin": "Удалить плагин", - "new-password": "Новый пароль, + "new-password": "Новый пароль", "edit-user": "Редактировать пользователя", "publish-now": "Опубликовать сейчас", "first-name": "Имя",