adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-06 09:52:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug 2615 php notice in calendar amd web service

Browse Source 
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
This commit is contained in:
rvelices
2012-04-14 04:52:20 +00:00
parent 10bf036231
commit 1b54eb8e9c
4 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/calendar_monthly.class.php
+5 -1
View File
@@ -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();