diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php index a8d17388d41..bf2caf1b255 100644 --- a/htdocs/install/step1.php +++ b/htdocs/install/step1.php @@ -423,13 +423,11 @@ if (! $error && $db->connected && $action == "set") // Les documents sont en dehors de htdocs car ne doivent pas pouvoir etre telecharges en passant outre l'authentification $dir[0] = $main_data_dir."/mycompany"; $dir[1] = $main_data_dir."/users"; - $dir[2] = $main_data_dir."/custom"; - $dir[3] = $main_data_dir."/facture"; - $dir[4] = $main_data_dir."/propale"; - $dir[5] = $main_data_dir."/ficheinter"; - $dir[6] = $main_data_dir."/produit"; - $dir[7] = $main_data_dir."/doctemplates"; - $dir[7] = $main_data_dir."/extensions"; + $dir[2] = $main_data_dir."/facture"; + $dir[3] = $main_data_dir."/propale"; + $dir[4] = $main_data_dir."/ficheinter"; + $dir[5] = $main_data_dir."/produit"; + $dir[6] = $main_data_dir."/doctemplates"; // Boucle sur chaque repertoire de dir[] pour les creer s'ils nexistent pas $num=count($dir); diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang index 457b6fd3fcd..c2f267c20ee 100644 --- a/htdocs/langs/en_US/modulebuilder.lang +++ b/htdocs/langs/en_US/modulebuilder.lang @@ -25,7 +25,7 @@ EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files relat DangerZone=Danger zone BuildPackage=Build package/documentation BuildDocumentation=Build documentation -ModuleIsNotActive=This module was not activated yet. Ggo into %s to make it live or click here: +ModuleIsNotActive=This module was not activated yet. Go into %s to make it live or click here: ModuleIsLive=This module has been activated. Any change on it may break a current active feature. DescriptionLong=Long description EditorName=Name of editor diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php index 9b3029c659d..b5de4c0226c 100644 --- a/htdocs/modulebuilder/template/myobject_card.php +++ b/htdocs/modulebuilder/template/myobject_card.php @@ -129,8 +129,8 @@ if (empty($reshook)) { foreach ($object->fields as $key => $val) { - if (in_array($key, array('entity', 'date_creation', 'tms', 'import_key'))) continue; // Ignore special fields - + if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'import_key'))) continue; // Ignore special fields + $object->$key=GETPOST($key,'alpha'); if ($val['notnull'] && $object->$key == '') { @@ -169,7 +169,7 @@ if (empty($reshook)) foreach ($object->fields as $key => $val) { $object->$key=GETPOST($key,'alpha'); - if (in_array($key, array('entity', 'datec', 'tms'))) continue; + if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'import_key'))) continue; if ($val['notnull'] && $object->$key == '') { $error++;