diff options
| author | Greg Roach <fisharebest@gmail.com> | 2017-07-12 22:48:51 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2017-07-12 23:11:38 +0100 |
| commit | cdf416fba6b8c5dceb8de09cc099b16980991d83 (patch) | |
| tree | c354c9e331e83353e34cdfe6dc0a51ce67d9b562 /app/Report/ReportParserGenerate.php | |
| parent | 767f11f92adf74fa4bfc1fbc4b9a296b3ce1e513 (diff) | |
| download | webtrees-cdf416fba6b8c5dceb8de09cc099b16980991d83.tar.gz webtrees-cdf416fba6b8c5dceb8de09cc099b16980991d83.tar.bz2 webtrees-cdf416fba6b8c5dceb8de09cc099b16980991d83.zip | |
Report images
Diffstat (limited to 'app/Report/ReportParserGenerate.php')
| -rw-r--r-- | app/Report/ReportParserGenerate.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/Report/ReportParserGenerate.php b/app/Report/ReportParserGenerate.php index ff7d396ac1..4380dd53f1 100644 --- a/app/Report/ReportParserGenerate.php +++ b/app/Report/ReportParserGenerate.php @@ -1616,7 +1616,7 @@ class ReportParserGenerate extends ReportParserBase { $person = Individual::getInstance($id, $WT_TREE); $mediaobject = $person->findHighlightedMedia(); if ($mediaobject) { - $attributes = $mediaobject->getImageAttributes('thumb'); + $attributes = $mediaobject->getImageAttributes(); if (in_array( $attributes['ext'], [ @@ -1637,7 +1637,7 @@ class ReportParserGenerate extends ReportParserBase { 'WBMP', 'XBM', ] - ) && $mediaobject->canShow() && $mediaobject->fileExists('thumb') + ) && $mediaobject->canShow() && $mediaobject->fileExists('main') ) { if ($width > 0 && $height == 0) { $perc = $width / $attributes['adjW']; @@ -1716,7 +1716,8 @@ class ReportParserGenerate extends ReportParserBase { $match = []; if (preg_match("/\d OBJE @(.+)@/", $this->gedrec, $match)) { $mediaobject = Media::getInstance($match[1], $WT_TREE); - $attributes = $mediaobject->getImageAttributes('thumb'); + $attributes = $mediaobject->getImageAttributes(); + if (in_array( $attributes['ext'], [ @@ -1737,7 +1738,7 @@ class ReportParserGenerate extends ReportParserBase { 'WBMP', 'XBM', ] - ) && $mediaobject->canShow() && $mediaobject->fileExists('thumb') + ) && $mediaobject->canShow() && $mediaobject->fileExists('main') ) { if ($width > 0 && $height == 0) { $perc = $width / $attributes['adjW']; |