aboutsummaryrefslogtreecommitdiffstats
path: root/include/calendar_monthly.class.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-04-14 04:52:20 +0000
committerrvelices <rv-github@modusoptimus.com>2012-04-14 04:52:20 +0000
commit1b54eb8e9ca1d5ac7d2fc28b37c39bf369bd0729 (patch)
tree2c61d1f9b020f2e7db58ed20a28dcce648cba570 /include/calendar_monthly.class.php
parent10bf036231fb219ecb4cc8b6121cfec196da7eef (diff)
bug 2615 php notice in calendar amd web service
multisize improve handling of cases where the original is smaller than a requested derivative, but rotation/watermarking is required git-svn-id: http://piwigo.org/svn/trunk@14143 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/calendar_monthly.class.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/calendar_monthly.class.php b/include/calendar_monthly.class.php
index 37c720bea..1109bbf1c 100644
--- a/include/calendar_monthly.class.php
+++ b/include/calendar_monthly.class.php
@@ -350,7 +350,7 @@ function build_month_calendar(&$tpl_var)
{
$page['chronology_date'][CDAY]=$day;
$query = '
-SELECT id, file,representative_ext,path,width, height, '.pwg_db_get_dayofweek($this->date_field).'-1 as dow';
+SELECT id, file,representative_ext,path,width,height,rotation, '.pwg_db_get_dayofweek($this->date_field).'-1 as dow';
$query.= $this->inner_sql;
$query.= $this->get_date_where();
$query.= '
@@ -392,6 +392,10 @@ SELECT id, file,representative_ext,path,width, height, '.pwg_db_get_dayofweek($t
}
list($cell_width, $cell_height) = ImageStdParams::get_by_type(IMG_SQUARE)->sizing->ideal_size;
+ if ($cell_width>120)
+ {
+ $cell_width = $cell_height = 120;
+ }
$tpl_weeks = array();
$tpl_crt_week = array();