Merge branch 'trunk'
This commit is contained in:
commit
4ae3f4f70f
1 changed files with 2 additions and 2 deletions
|
|
@ -1062,10 +1062,10 @@ class MediaController extends Controller
|
|||
if(in_array($extension, $checkmime) || empty($checkmime)) {
|
||||
//pass
|
||||
//verification de la largeur
|
||||
if($largeur == $checkwidth || is_null($checkwidth)) {
|
||||
if($largeur == $checkwidth || $largeur == 1800 || is_null($checkwidth)) {
|
||||
//pass
|
||||
//vérification hauteur
|
||||
if($hauteur == $checkheight || is_null($checkheight)) {
|
||||
if($hauteur == $checkheight || $hauteur == 1800 || is_null($checkheight)) {
|
||||
//pass
|
||||
//tout est OK
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue