Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix for php7.2

Browse Source
This commit is contained in:
Laurent Destailleur 2017-11-17 18:04:55 +01:00
parent ede1f3fdfc
commit b07895a26a
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/webservices/server_actioncomm.php
View File

@ -128,7 +128,7 @@ foreach($extrafields->attribute_label as $key=>$label)
$extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
}
$actioncomm_fields=array_merge($actioncomm_fields,$extrafield_array);
if (is_array($extrafield_array)) $actioncomm_fields=array_merge($actioncomm_fields,$extrafield_array);
// Define other specific objects
$server->wsdl->addComplexType(

2
htdocs/webservices/server_contact.php
View File

@ -133,7 +133,7 @@ foreach($extrafields->attribute_label as $key=>$label)
$extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
}
$contact_fields=array_merge($contact_fields,$extrafield_array);
if (is_array($extrafield_array)) $contact_fields=array_merge($contact_fields,$extrafield_array);
// Define other specific objects
$server->wsdl->addComplexType(

7
htdocs/webservices/server_order.php
View File

@ -128,7 +128,7 @@ foreach($extrafields->attribute_label as $key=>$label)
else {$type='xsd:string';}
$extrafield_line_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
}
$line_fields=array_merge($line_fields,$extrafield_line_array);
if (is_array($extrafield_line_array)) $line_fields=array_merge($line_fields,$extrafield_line_array);
// Define other specific objects
$server->wsdl->addComplexType(
@ -216,7 +216,8 @@ $order_fields = array(
// fetch optionals attributes and labels
$extrafields=new ExtraFields($db);
$extralabels=$extrafields->fetch_name_optionals_label('commande',true);
if (count($extrafields)>0) {
$extrafield_array=null;
if (is_array($extrafields) && count($extrafields)>0) {
$extrafield_array = array();
}
foreach($extrafields->attribute_label as $key=>$label)
@ -227,7 +228,7 @@ foreach($extrafields->attribute_label as $key=>$label)
else {$type='xsd:string';}
$extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
}
$order_fields=array_merge($order_fields,$extrafield_array);
if (is_array($extrafield_array)) $order_fields=array_merge($order_fields,$extrafield_array);
$server->wsdl->addComplexType(
'order',

2
htdocs/webservices/server_productorservice.php
View File

@ -147,7 +147,7 @@ foreach($extrafields->attribute_label as $key=>$label)
$extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
}
$productorservice_fields=array_merge($productorservice_fields,$extrafield_array);
if (is_array($extrafield_array)) $productorservice_fields=array_merge($productorservice_fields,$extrafield_array);
// Define other specific objects
$server->wsdl->addComplexType(

2
htdocs/webservices/server_project.php
View File

@ -175,7 +175,7 @@ foreach($extrafields->attribute_label as $key=>$label)
else {$type='xsd:string';}
$extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
}
$project_fields=array_merge($project_fields,$extrafield_array);
if (is_array($extrafield_array)) $project_fields=array_merge($project_fields,$extrafield_array);
$server->wsdl->addComplexType(
'project',

2
htdocs/webservices/server_thirdparty.php
View File

@ -138,7 +138,7 @@ foreach($extrafields->attribute_label as $key=>$label)
$extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
}
$thirdparty_fields=array_merge($thirdparty_fields,$extrafield_array);
if (is_array($extrafield_array)) $thirdparty_fields=array_merge($thirdparty_fields,$extrafield_array);
// Define other specific objects
$server->wsdl->addComplexType(

2
htdocs/webservices/server_user.php
View File

@ -200,7 +200,7 @@ foreach($extrafields->attribute_label as $key=>$label)
$extrafield_array['contact_options_'.$key]=array('name'=>'contact_options_'.$key,'type'=>$type);
}
$thirdpartywithuser_fields=array_merge($thirdpartywithuser_fields,$extrafield_array);
if (is_array($extrafield_array)) $thirdpartywithuser_fields=array_merge($thirdpartywithuser_fields,$extrafield_array);
$server->wsdl->addComplexType(