diff --git a/htdocs/document.php b/htdocs/document.php index 442301c00f7..1384dec62a2 100644 --- a/htdocs/document.php +++ b/htdocs/document.php @@ -417,7 +417,7 @@ if ($modulepart) { $accessallowed=1; } - $original_file=$conf->admin->dir_temp.'/'.$original_file; + $original_file=$conf->admin->dir_output.'/'.$original_file; $sqlprotectagainstexternals = ''; } diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 4293cf10f56..5cd12c3fb2b 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -1466,6 +1466,9 @@ function img_mime($file,$alt='') if (preg_match('/\.(mp3|ogg|au|wav|wma)$/i',$file)) $mime='audio'; if (preg_match('/\.(avi|divx|xvid|wmv|mpg|mpeg)$/i',$file)) $mime='video'; if (preg_match('/\.(zip|rar|gz|tgz|z|cab|bz2|7z)$/i',$file)) $mime='archive'; + + if (preg_match('/\.err$/i',$file)) $mime='error'; + if (empty($alt)) $alt='Mime type: '.$mime; $mime.='.png';