Fix travis
This commit is contained in:
parent
6aea67a5b9
commit
f6b216eafc
@ -5744,7 +5744,6 @@ abstract class CommonObject
|
|||||||
|
|
||||||
foreach($new_array_languages as $key => $langcodearray) { // $key = 'name', 'town', ...
|
foreach($new_array_languages as $key => $langcodearray) { // $key = 'name', 'town', ...
|
||||||
foreach($langcodearray as $langcode => $value) {
|
foreach($langcodearray as $langcode => $value) {
|
||||||
|
|
||||||
$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."object_lang";
|
$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."object_lang";
|
||||||
$sql_del .= " WHERE fk_object = ".$this->id." AND property = '".$this->db->escape($key)."' AND type_object = '".$this->db->escape($table_element)."'";
|
$sql_del .= " WHERE fk_object = ".$this->id." AND property = '".$this->db->escape($key)."' AND type_object = '".$this->db->escape($table_element)."'";
|
||||||
$sql_del .= " AND lang = '".$this->db->escape($langcode)."'";
|
$sql_del .= " AND lang = '".$this->db->escape($langcode)."'";
|
||||||
|
|||||||
@ -1551,7 +1551,6 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
|
|||||||
{
|
{
|
||||||
$destfull = $upload_dir."/".preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask);
|
$destfull = $upload_dir."/".preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask);
|
||||||
$destfile = preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask);
|
$destfile = preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// dol_sanitizeFileName the file name and lowercase extension
|
// dol_sanitizeFileName the file name and lowercase extension
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user