aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-06-05 18:06:53 +0000
committerrvelices <rv-github@modusoptimus.com>2012-06-05 18:06:53 +0000
commit34e6f1aa4905228d317511cdd4b57b759261ad39 (patch)
tree0d6339d82ffdaec1e9cc209b4d67717aebb566a8
parent29970791817164b0c158cbdc961bb93160721af1 (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 '')
-rw-r--r--admin/include/image.class.php4
-rw-r--r--admin/themes/default/template/configuration.tpl2
-rw-r--r--i.php7
-rw-r--r--themes/default/template/picture.tpl6
4 files changed, 12 insertions, 7 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}
diff --git a/i.php b/i.php
index 1de7dbf6e..44faa32ce 100644
--- a/i.php
+++ b/i.php
@@ -116,6 +116,7 @@ function ierror($msg, $code)
}
//todo improve
echo $msg;
+ ilog('ERROR', $code, $msg, $_SERVER['REQUEST_URI']);
exit;
}
@@ -486,6 +487,10 @@ SELECT *
ilog("db error", $e->getMessage());
}
}
+else
+{
+ $page['rotation_angle'] = 0;
+}
mysql_close($pwg_db_link);
try_switch_source($params, $src_mtime);
@@ -504,7 +509,7 @@ $timing['load'] = time_step($step);
$changes = 0;
// rotate
-if (0 != (int)$page['rotation_angle'])
+if (0 != $page['rotation_angle'])
{
$image->rotate($page['rotation_angle']);
$changes++;
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index 8795d0bc1..1862fa35f 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -257,12 +257,10 @@ y.callService(
if (e) e.innerHTML = rating.score;
e = document.getElementById("ratingCount");
if (e) {ldelim}
- if (rating.count == 1) {ldelim}
+ if (rating.count == 1)
e.innerHTML = "({'%d rate'|@translate|@escape:'javascript'})".replace( "%d", rating.count);
- {rdelim}
- else {ldelim}
+ else
e.innerHTML = "({'%d rates'|@translate|@escape:'javascript'})".replace( "%d", rating.count);
- {rdelim}
{rdelim}
{rdelim}{rdelim} );
{/footer_script}