diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/include/photos_add_direct_prepare.inc.php | 2 | ||||
| -rw-r--r-- | admin/themes/default/template/photos_add_direct.tpl | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/admin/include/photos_add_direct_prepare.inc.php b/admin/include/photos_add_direct_prepare.inc.php index 0ec506cdf..f9443553d 100644 --- a/admin/include/photos_add_direct_prepare.inc.php +++ b/admin/include/photos_add_direct_prepare.inc.php @@ -108,7 +108,7 @@ if (pwg_image::get_library() == 'gd') $upload_modes = array('html', 'multiple'); $upload_mode = isset($conf['upload_mode']) ? $conf['upload_mode'] : 'multiple'; -if (isset($_GET['upload_mode']) and in_array($_GET['upload_mode'], $upload_modes)) +if (isset($_GET['upload_mode']) and $upload_mode != $_GET['upload_mode'] and in_array($_GET['upload_mode'], $upload_modes)) { $upload_mode = $_GET['upload_mode']; conf_update_param('upload_mode', $upload_mode); diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl index 3ebfff1d4..6794e0407 100644 --- a/admin/themes/default/template/photos_add_direct.tpl +++ b/admin/themes/default/template/photos_add_direct.tpl @@ -76,11 +76,13 @@ jQuery(document).ready(function(){ jQuery("#uploadWarningsSummary a.showInfo").click(function() { jQuery("#uploadWarningsSummary").hide(); jQuery("#uploadWarnings").show(); + return false; }); jQuery("#showPermissions").click(function() { jQuery(this).parent(".showFieldset").hide(); jQuery("#permissions").show(); + return false; }); {/literal} |