Merge branch '2.6.x' of https://github.com/centreon/centreon into 2.6.x

www/class/centreonHost.class.php

@@ -559,11 +559,13 @@ class CentreonHost {
                 $i++;
             }
         } else {
+            if (isset($_REQUEST['tpSelect'])) {
                 foreach ($_REQUEST['tpSelect'] as $val) {
                     $arr[$i]['tpSelect_#index#'] = $val;
                     $i++;
                 }
             }
+        }
         return $arr;
     }
 

www/include/configuration/configObject/host_template_model/formHostTemplateModel.php

@@ -46,7 +46,7 @@
 	#
 	$host = array();
 	if (($o == "c" || $o == "w") && $host_id)	{
-		$DBRESULT = $pearDB->query("SELECT * FROM host, extended_host_information ehi WHERE host_id = '".$host_id."' AND ehi.host_host_id = host.host_id LIMIT 1");
+		$DBRESULT = $pearDB->query("SELECT * FROM host LEFT JOIN extended_host_information ehi ON ehi.host_host_id = host.host_id WHERE host_id = '".$host_id."' LIMIT 1");
 
 		# Set base value
 		if ($DBRESULT->numRows())	{

www/include/configuration/configObject/service/formService.php

@@ -135,7 +135,7 @@
     $initialValues = array();
 	if (($o == "c" || $o == "w") && $service_id) {
 
-		$DBRESULT = $pearDB->query("SELECT * FROM service, extended_service_information esi WHERE service_id = '".$service_id."' AND esi.service_service_id = service_id LIMIT 1");
+		$DBRESULT = $pearDB->query("SELECT * FROM service LEFT JOIN extended_service_information esi ON  esi.service_service_id = service_id  WHERE service_id = '".$service_id."' LIMIT 1");
 		/*
 		 * Set base value
 		 */

www/include/configuration/configObject/service_template_model/formServiceTemplateModel.php

@@ -57,7 +57,7 @@ if (($o == "c" || $o == "w") && $service_id) {
     if (isset($lockedElements[$service_id])) {
         $o = "w";
     }            
-    $DBRESULT = $pearDB->query("SELECT * FROM service, extended_service_information esi WHERE service_id = '".$service_id."' AND esi.service_service_id = service_id LIMIT 1");
+    $DBRESULT = $pearDB->query("SELECT * FROM service LEFT JOIN extended_service_information esi ON esi.service_service_id = service_id WHERE service_id = '".$service_id."'  LIMIT 1");
     // Set base value
     $service_list = $DBRESULT->fetchRow();
     $service = array_map("myDecodeSvTP", $service_list);