From 87609dcdabbddb7f73ac12af80469b12226cbab0 Mon Sep 17 00:00:00 2001
From: MaHarder <info@maxim-harder.de>
Date: Wed, 9 Feb 2022 13:11:22 +0100
Subject: [PATCH] fixed

---
 manifest.json                            |  4 ++--
 upload/engine/ajax/favall/favall_inc.php | 10 ++++++----
 upload/engine/inc/favall.php             |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/manifest.json b/manifest.json
index 2c0cd30..c16f2ae 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
-	"version"	: 	"4.6",
+	"version"	: 	"4.6.1",
 	"name"		:	"DLE FavAll",
-	"dle"		:	"14.x",
+	"dle"		:	"14.x, 15.x",
 	"author"	:	[
 		"d0gmatist",
 		"MaHarder",
diff --git a/upload/engine/ajax/favall/favall_inc.php b/upload/engine/ajax/favall/favall_inc.php
index 94b6bf5..d57f9ee 100644
--- a/upload/engine/ajax/favall/favall_inc.php
+++ b/upload/engine/ajax/favall/favall_inc.php
@@ -55,10 +55,12 @@
     if ($json["success"] == true) {
         $bad_words = explode("|~|", $favall_config["bad_words"]);
         foreach ($bad_words as $i) {
-            if (preg_match("/" . $i . "/i", $fav_name)) {
-                $json["success"] = false;
-                $json["result"] = "Поле \"Имя\" содержит не допустимое слово.";
-            }
+			if(!empty($i)) {
+				if (preg_match("/{$i}/i", $fav_name)) {
+					$json["success"] = false;
+					$json["result"]  = "Поле \"Имя\" содержит не допустимое слово.";
+				}
+			}
         }
     }
     if ($json["success"] == true && preg_match("/[\\||\\'|\\<|\\>|\\[|\\]|\"|\\!|\\?|\$|\\@|\\/|\\\\|\\&\\~\\*\\{\\+\\,\\.]/", $fav_name)) {
diff --git a/upload/engine/inc/favall.php b/upload/engine/inc/favall.php
index ff02ba1..5f5afbe 100644
--- a/upload/engine/inc/favall.php
+++ b/upload/engine/inc/favall.php
@@ -399,7 +399,7 @@ function get_active($var) {
 	if ( $_POST) {
 		$favall_con = $_POST['favall_con'];
 		if ( $favall_config ) {
-			$favall_con = $favall_con + $favall_config;
+			$favall_con = array_merge_recursive($favall_config, $favall_con);
 
 		}