Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Data in memory must always be encoded in utf8. PHP files functions need ISO, so we convert data just before and after using them.

Browse Source
This commit is contained in:
Laurent Destailleur
2009-10-04 17:18:09 +00:00
parent e192abc755
commit f68be991ff
15 changed files with 502 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/includes/modules/livraison/modules_livraison.php
View File

@@ -54,10 +54,10 @@ class ModelePDFDeliveryOrder extends FPDF
function liste_modeles($db)
{
global $conf;
$type='delivery';
$liste=array();
$sql = "SELECT nom as id, nom as lib";
$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
$sql.= " WHERE type = '".$type."'";
@@ -161,9 +161,9 @@ class ModeleNumRefDeliveryOrder
/**
* \brief Create object on disk
* \param db objet base de donn<6E>e
* \param db objet base de donn<6E>e
* \param deliveryid id object
* \param modele force le modele <20> utiliser ('' to not force)
* \param modele force le modele <20> utiliser ('' to not force)
* \param outputlangs objet lang a utiliser pour traduction
* \return int 0 si KO, 1 si OK
*/
@@ -240,12 +240,14 @@ function delivery_order_delete_preview($db, $deliveryid)
if ( file_exists( $file ) && is_writable( $file ) )
{
if ( ! unlink($file) )
if ( ! dol_delete_file($file,1) )
{
$this->error=$langs->trans("ErrorFailedToOpenFile",$file);
return 0;
}
}
}
return 1;
}
?>