Skip to content

Commit

Permalink
Merge pull request #1156 from MaisonLogicielLibre/develop
Browse files Browse the repository at this point in the history
mise a jour
  • Loading branch information
willkoua committed May 17, 2016
2 parents aadd24f + 4f43c48 commit 6b1cb11
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Controller/PagesController.php
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ public function administration($img = null)
$hidden = $request->data('hidden');
$fileName = $image['name'];
$dim = null;
print_r($image);

if (!empty($image['tmp_name']) && $image['type'] == 'image/png') {
$dim = getimagesize($image['tmp_name']);

Expand Down
Binary file modified webroot/img/carousel/tv3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified webroot/img/carousel/tv4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6b1cb11

Please sign in to comment.