Fix: Removed warning

Dolibarr · Mar 4, 2012 · f241e33 · f241e33
1 parent 93d838d
commit f241e33
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
@@ -73,7 +73,7 @@
 
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array_merge(array('/'),$conf->modules_parts['models']);
+	$dirmodels=array_merge(array('/'),(array)$conf->modules_parts['models']);
 	foreach($dirmodels as $reldir)
 	{
 	    $file=dol_buildpath($reldir."core/modules/commande/doc/pdf_".$modele.".modules.php",0);
@@ -223,7 +223,7 @@
  * View
  */
 
-$dirmodels=array_merge(array('/'),$conf->modules_parts['models']);
+$dirmodels=array_merge(array('/'),(array)$conf->modules_parts['models']);
 
 llxHeader();
 

diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
@@ -72,7 +72,7 @@
 
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array_merge(array('/'),$conf->modules_parts['models']);
+	$dirmodels=array_merge(array('/'),(array)$conf->modules_parts['models']);
 	foreach($dirmodels as $reldir)
 	{
 	    $file=dol_buildpath($reldir."core/modules/facture/doc/pdf_".$modele.".modules.php",0);
@@ -291,7 +291,7 @@
  * View
  */
 
-$dirmodels=array_merge(array('/'),$conf->modules_parts['models']);
+$dirmodels=array_merge(array('/'),(array)$conf->modules_parts['models']);
 
 llxHeader("",$langs->trans("BillsSetup"),'EN:Invoice_Configuration|FR:Configuration_module_facture|ES:ConfiguracionFactura');
 

diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php
@@ -78,7 +78,7 @@
 
     // Search template files
     $file=''; $classname=''; $filefound=0;
-    $dirmodels=array_merge(array('/'),$conf->modules_parts['models']);
+    $dirmodels=array_merge(array('/'),(array)$conf->modules_parts['models']);
     foreach($dirmodels as $reldir)
     {
     	$file=dol_buildpath($reldir."core/modules/supplier_order/pdf/pdf_".$modele.".modules.php",0);
@@ -124,7 +124,7 @@
 
 	// Search template files
     $file=''; $classname=''; $filefound=0;
-    $dirmodels=array_merge(array('/'),$conf->modules_parts['models']);
+    $dirmodels=array_merge(array('/'),(array)$conf->modules_parts['models']);
     foreach($dirmodels as $reldir)
     {
     	$file=dol_buildpath($reldir."core/modules/supplier_invoice/pdf/pdf_".$modele.".modules.php",0);
@@ -262,7 +262,7 @@
  * View
  */
 
-$dirmodels=array_merge(array('/'),$conf->modules_parts['models']);
+$dirmodels=array_merge(array('/'),(array)$conf->modules_parts['models']);
 
 llxHeader();
 

diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php
@@ -71,7 +71,7 @@
 
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array_merge(array('/'),$conf->modules_parts['models']);
+	$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
 	foreach($dirmodels as $reldir)
 	{
 	    $file=dol_buildpath($reldir."core/modules/propale/doc/pdf_".$modele.".modules.php");
@@ -257,7 +257,7 @@
  * Affiche page
  */
 
-$dirmodels=array_merge(array('/'),$conf->modules_parts['models']);
+$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
 
 llxHeader('',$langs->trans("PropalSetup"));