diff options
| author | rvelices <rv-github@modusoptimus.com> | 2012-06-05 18:06:53 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2012-06-05 18:06:53 +0000 |
| commit | 34e6f1aa4905228d317511cdd4b57b759261ad39 (patch) | |
| tree | 0d6339d82ffdaec1e9cc209b4d67717aebb566a8 /admin | |
| parent | 29970791817164b0c158cbdc961bb93160721af1 (diff) | |
multisize - avoid php warning for rotation_angle; better error logging; javascript avoid navigation to empty # anchor
git-svn-id: http://piwigo.org/svn/trunk@15551 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/include/image.class.php | 4 | ||||
| -rw-r--r-- | admin/themes/default/template/configuration.tpl | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/admin/include/image.class.php b/admin/include/image.class.php index 8ab6d9384..97875b796 100644 --- a/admin/include/image.class.php +++ b/admin/include/image.class.php @@ -275,7 +275,7 @@ class pwg_image static function get_rotation_angle_from_code($rotation_code) { - switch($rotation_code) + switch($rotation_code%4) { case 0: return 0; case 1: return 90; @@ -623,7 +623,7 @@ class image_ext_imagick implements imageInterface ilog($exec); if (is_array($returnarray) && (count($returnarray)>0) ) { - ilog($returnarray); + ilog('ERROR', $returnarray); } return is_array($returnarray); } diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl index 3c87f1186..7fbbb26ad 100644 --- a/admin/themes/default/template/configuration.tpl +++ b/admin/themes/default/template/configuration.tpl @@ -293,6 +293,7 @@ jQuery(document).ready(function(){ var sizeName = jQuery(this).attr("id").split("-")[1]; jQuery("#sizeEdit-"+sizeName).toggle(); jQuery(this).hide(); + return false; }); jQuery(".cropToggle").click(function() { @@ -490,6 +491,7 @@ jQuery(document).ready(function() { jQuery(".addWatermarkOpen").click(function(){ jQuery("#addWatermark, #selectWatermark").toggle(); + return false; }); }); {/literal}{/footer_script} |