From a7450dfe3740a1c0bd91bb50ff850eed7697e4c8 Mon Sep 17 00:00:00 2001 From: "Roman Schmerold (BNoiZe)" Date: Sat, 11 Oct 2014 09:08:27 +0200 Subject: [PATCH] Fixed duplicate creation of directory protection, fixes #1450 Signed-off-by: Roman Schmerold (BNoiZe) --- scripts/jobs/cron_tasks.inc.http.30.nginx.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/jobs/cron_tasks.inc.http.30.nginx.php b/scripts/jobs/cron_tasks.inc.http.30.nginx.php index f304064a..a865ab3f 100644 --- a/scripts/jobs/cron_tasks.inc.http.30.nginx.php +++ b/scripts/jobs/cron_tasks.inc.http.30.nginx.php @@ -696,7 +696,7 @@ class nginx { protected function getHtpasswds($domain) { $result_stmt = Database::prepare(" - SELECT DISTINCT * + SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "` AS a JOIN `" . TABLE_PANEL_DOMAINS . "` AS b USING (`customerid`) WHERE b.customerid = :customerid AND b.domain = :domain @@ -733,6 +733,10 @@ class nginx { $x++; } } + + // Remove duplicate entries + $returnval = array_map("unserialize", array_unique(array_map("serialize", $returnval))); + return $returnval; }