From 32a539a8c0c381815e25ca97c9eebd04043707a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Dec 2019 09:19:05 +0100
Subject: [PATCH] Update website templates

---
 htdocs/core/modules/modWebsite.class.php | 2 +-
 htdocs/website/index.php                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php
index 52c25f2450e..dc19ce2e29b 100644
--- a/htdocs/core/modules/modWebsite.class.php
+++ b/htdocs/core/modules/modWebsite.class.php
@@ -189,7 +189,7 @@ class modWebsite extends DolibarrModules
 	    	$src=$srcroot.'/'.$cursorfile['name'];
 	    	$dest=$destroot.'/'.$cursorfile['name'];
 
-	    	$result=dol_copy($src, $dest, 0, 0);
+	    	$result=dol_copy($src, $dest, 0, 1);	// For full zip templates, we overwrite old existing files
 	    	if ($result < 0) {
 	    		$langs->load("errors");
 	    		$this->error=$langs->trans('ErrorFailToCopyFile', $src, $dest);
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index dff0dd70175..ef05483d705 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2124,7 +2124,7 @@ if (!GETPOST('hide_websitemenu'))
 		}
 		elseif (empty($virtualurl))
 		{
-		    $htmltext .= '<br><span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span><br><br>';
+		    //$htmltext .= '<br><span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span><br><br>';
 		}
 		else
 		{