From 6811d446bb458de7a6d14481459c7529e33ce78a Mon Sep 17 00:00:00 2001
From: betateilchen <>
Date: Mon, 15 May 2017 18:56:49 +0000
Subject: [PATCH] configDB.pm: prepare for holiday-filename-compatibility

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@14296 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 configDB.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/configDB.pm b/configDB.pm
index 302d1a210..cc018626c 100644
--- a/configDB.pm
+++ b/configDB.pm
@@ -613,7 +613,11 @@ sub cfgDB_MigrationImport() {
 	@def = _cfgDB_findDef('TYPE=holiday','NAME');
 	foreach $filename (@def) {
 		next unless $filename;
-		push @files, "$modpath/FHEM/".$filename.".holiday";
+		if(defined($defs{$filename}{HOLIDAYFILE})) {
+           push @files, $defs{$filename}{HOLIDAYFILE};
+		} else {
+           push @files, "$modpath/FHEM/".$filename.".holiday";
+		}
 	}
 
 # import uniqueID file