Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into d…

…evelop
Dolibarr · Jan 16, 2019 · 21741b6 · 21741b6
2 parents a72d920 + 1f9d079
commit 21741b6
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
@@ -221,8 +221,6 @@
 		$handle = opendir($dir);
 		if (is_resource($handle))
 		{
-			$var=true;
-
 			while (($file = readdir($handle))!==false)
 			{
 				if (substr($file, 0, 12) == 'mod_holiday_' && substr($file, dol_strlen($file)-3, 3) == 'php')
@@ -309,7 +307,7 @@
 
 print load_fiche_titre($langs->trans("TemplatePDFHolidays"),'','');
 
-// Defini tableau def des modeles
+// Defined model definition table
 $def = array();
 $sql = "SELECT nom";
 $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
@@ -405,7 +403,7 @@
 	                                print "</td>";
 	                            }
 
-	                            // Defaut
+	                            // Default
 	                            print '<td align="center">';
 	                            if ($conf->global->HOLIDAY_ADDON_PDF == $name)
 	                            {