From 68c31c55c521fda0807805a1fdf38b9baea6ee20 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Aug 2017 01:24:34 +0200
Subject: [PATCH 1/3] FIX delete dir when there is symlinks

---
 htdocs/core/lib/files.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index c3d69c9e829..99b80049999 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -630,9 +630,9 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
         $dir_handle=opendir($ossrcfile);
         while ($file=readdir($dir_handle))
         {
-            if ($file!="." && $file!="..")
+            if ($file != "." && $file != ".." && ! is_link($ossrcfile."/".$file))
             {
-                if (is_dir($ossrcfile."/".$file) && ! is_link($ossrcfile."/".$file))
+                if (is_dir($ossrcfile."/".$file))
                 {
                     //var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
                     $tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);

From 84d584f60734d104b944f9b799c1c50db89bbba4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Aug 2017 01:39:22 +0200
Subject: [PATCH 2/3] Missing translation

---
 htdocs/langs/en_US/main.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 333943c02cc..8d180568073 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -793,6 +793,7 @@ AutomaticallyCalculated=Automatically calculated
 TitleSetToDraft=Go back to draft
 ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 ImportId=Import id
+Websites=Web sites
 # Week day
 Monday=Monday
 Tuesday=Tuesday

From d7be62b7daeeafa99040822581503ede17a1692a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Aug 2017 11:02:24 +0200
Subject: [PATCH 3/3] Better style

---
 htdocs/theme/md/style.css.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 267d745b9f3..f75b1375894 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3077,15 +3077,13 @@ div.error {
 
 /* Info admin */
 div.info {
-  color: #303035;
+  color: #fff;
   padding: 0.4em 0.4em 0.4em 0.4em;
   margin: 0.5em 0em 0.5em 0em;
-  border: 1px solid #e0e0e0;
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
-  background: #868;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  background: #989;
 }
 
 div.warning a, div.info a, div.error a {