Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
d02df05a
Commit
d02df05a
authored
11 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Plain Diff
Merge branch 'marcosgdf-bug-1526' into 3.5
parents
ff5ea314
4bc8e026
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+1
-0
1 addition, 0 deletions
ChangeLog
htdocs/core/class/html.formfile.class.php
+4
-2
4 additions, 2 deletions
htdocs/core/class/html.formfile.class.php
with
5 additions
and
2 deletions
ChangeLog
+
1
−
0
View file @
d02df05a
...
@@ -45,6 +45,7 @@ Fix: [ bug #1484 ] BILL_SUPPLIER_PAYED trigger action does not intercept failure
...
@@ -45,6 +45,7 @@ Fix: [ bug #1484 ] BILL_SUPPLIER_PAYED trigger action does not intercept failure
Fix: [ bug #1482 ] Several supplier invoice triggers do not show trigger error messages
Fix: [ bug #1482 ] Several supplier invoice triggers do not show trigger error messages
Fix: [ bug #1486 ] LINEBILL_SUPPLIER_CREATE and LINEBILL_SUPPLIER_UPDATE triggers do not intercept trigger action
Fix: [ bug #1486 ] LINEBILL_SUPPLIER_CREATE and LINEBILL_SUPPLIER_UPDATE triggers do not intercept trigger action
Fix: [ bug #1522 ] Element list into associate object into project are no more filterd by project thirdparty
Fix: [ bug #1522 ] Element list into associate object into project are no more filterd by project thirdparty
Fix: [ bug #1526 ] Thumbs of files uploaded with dots in their names do not load correctly
***** ChangeLog for 3.5.3 compared to 3.5.2 *****
***** ChangeLog for 3.5.3 compared to 3.5.2 *****
Fix: Error on field accountancy code for export profile of invoices.
Fix: Error on field accountancy code for export profile of invoices.
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/class/html.formfile.class.php
+
4
−
2
View file @
d02df05a
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
* Copyright (c) 2010 Juanjo Menent <jmenent@2byte.es>
* Copyright (c) 2010 Juanjo Menent <jmenent@2byte.es>
* Copyright (c) 2013 Charles-Fr BENKE <charles.fr@benke.fr>
* Copyright (c) 2013 Charles-Fr BENKE <charles.fr@benke.fr>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
* Copyright (c) 2014 Marcos García <marcosgdf@gmail.com>
*
*
* This program is free software; you can redistribute it and/or modify
* 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
* it under the terms of the GNU General Public License as published by
...
@@ -800,9 +801,10 @@ class FormFile
...
@@ -800,9 +801,10 @@ class FormFile
// Preview
// Preview
if
(
empty
(
$useinecm
))
if
(
empty
(
$useinecm
))
{
{
$fileinfo
=
pathinfo
(
$file
[
'name'
]);
print
'<td align="center">'
;
print
'<td align="center">'
;
$tmp
=
explode
(
'.'
,
$file
[
'name'
]);
$minifile
=
$fileinfo
[
'filename'
]
.
'_mini.'
.
$fileinfo
[
'extension'
];
// Thumbs are created with filename in lower case
$minifile
=
$tmp
[
0
]
.
'_mini.'
.
strtolower
(
$tmp
[
1
]);
// Thumbs are created with filename in lower case
if
(
image_format_supported
(
$file
[
'name'
])
>
0
)
print
'<img border="0" height="'
.
$maxheightmini
.
'" src="'
.
DOL_URL_ROOT
.
'/viewimage.php?modulepart='
.
$modulepart
.
'&file='
.
urlencode
(
$relativepath
.
'thumbs/'
.
$minifile
)
.
'" title="">'
;
if
(
image_format_supported
(
$file
[
'name'
])
>
0
)
print
'<img border="0" height="'
.
$maxheightmini
.
'" src="'
.
DOL_URL_ROOT
.
'/viewimage.php?modulepart='
.
$modulepart
.
'&file='
.
urlencode
(
$relativepath
.
'thumbs/'
.
$minifile
)
.
'" title="">'
;
else
print
' '
;
else
print
' '
;
print
'</td>'
;
print
'</td>'
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment