Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-02-22 14:38:13 +01:00
Code Issues Packages Projects Releases Activity

prevent double overlays on scaled media generation

Browse Source
This commit is contained in:
Gert
2015-01-27 21:29:14 +01:00
parent 7857568c92
commit 76d0583b00
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
system/src/Grav/Common/Page/Media.php
View File

@@ -254,9 +254,14 @@ class Media extends Getters
$basename = $medium->get('basename');
$basename = str_replace('@'.$from.'x', '@'.$to.'x', $basename);
$debug = $medium->get('debug');
$medium->set('debug', false);
$file = $medium->resize($width, $height)->setPrettyName($basename)->url();
$file = preg_replace('|'. preg_quote(self::$grav['base_url_relative']) .'$|', '', GRAV_ROOT) . $file;
$medium->set('debug', $debug);
$size = filesize($file);
$medium = $this->createMedium($file);

4
system/src/Grav/Common/Page/Medium.php
View File

@@ -114,7 +114,7 @@ class Medium extends Data
$this->def('mime', 'application/octet-stream');
}
$this->set('debug', self::$grav['config']->get('system.images.debug'));
}
/**
@@ -425,7 +425,7 @@ class Medium extends Data
$this->image();
}
if (self::$grav['config']->get('system.images.debug') && !$this->debug_watermarked) {
if ($this->get('debug') && !$this->debug_watermarked) {
$ratio = $this->get('ratio');
if (!$ratio) {