aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include/photos_add_direct_prepare.inc.php
diff options
context:
space:
mode:
authorflop25 <flop25@piwigo.org>2013-04-11 13:18:46 +0000
committerflop25 <flop25@piwigo.org>2013-04-11 13:18:46 +0000
commit0490009705dcef00c7b775e0287a707e0defc15f (patch)
tree929d101ef00a95744014662ea546432df3c2589a /admin/include/photos_add_direct_prepare.inc.php
parentc22683add2d8dba099d5046c0c4d2ee00e8a1ec5 (diff)
bug:2863
display a message on the upload page if "Resized after upload" is checked git-svn-id: http://piwigo.org/svn/trunk@22135 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/include/photos_add_direct_prepare.inc.php')
-rw-r--r--admin/include/photos_add_direct_prepare.inc.php13
1 files changed, 12 insertions, 1 deletions
diff --git a/admin/include/photos_add_direct_prepare.inc.php b/admin/include/photos_add_direct_prepare.inc.php
index f9443553d..9c4ede9f3 100644
--- a/admin/include/photos_add_direct_prepare.inc.php
+++ b/admin/include/photos_add_direct_prepare.inc.php
@@ -105,6 +105,18 @@ if (pwg_image::get_library() == 'gd')
}
}
+//warn the user if the picture will be resized after upload
+if ($conf['original_resize'])
+{
+ $template->assign(
+ array(
+ 'original_resize_maxwidth' => $conf['original_resize_maxwidth'],
+ 'original_resize_maxheight' => $conf['original_resize_maxheight'],
+ )
+ );
+}
+
+
$upload_modes = array('html', 'multiple');
$upload_mode = isset($conf['upload_mode']) ? $conf['upload_mode'] : 'multiple';
@@ -255,7 +267,6 @@ if (!isset($_SESSION['upload_hide_warnings']))
)
);
}
-
$template->assign(
array(
'setup_warnings' => $setup_warnings,