diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index 5c3aaf62e9d..d847bd2df71 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -1,7 +1,7 @@ - * Copyright (C) 2012 Regis Houssin - * Copyright (C) 2012 Juanjo Menent +/* Copyright (C) 2008-2012 Laurent Destailleur + * Copyright (C) 2012-2013 Regis Houssin + * Copyright (C) 2012 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -650,10 +650,10 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable $hookmanager->initHooks(array('fileslib')); $parameters=array('dest_file' => $dest_file, 'src_file' => $src_file, 'file_name' => $file_name, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite); - $reshook=$hookmanager->executeHooks('moveUploadedFile', $parameters, $object); + $hookmanager->executeHooks('moveUploadedFile', $parameters, $object); } - if (empty($reshook)) + if (empty($hookmanager->resPrint)) { // The file functions must be in OS filesystem encoding. $src_file_osencoded=dol_osencode($src_file); @@ -687,7 +687,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable } } else - return $reshook; + return $hookmanager->resPrint; } /**