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

Merge branch 'develop' of https://github.com/getgrav/grav into develop

Browse Source
This commit is contained in:
Andy Miller
2015-09-03 12:01:53 -06:00
parent 4de2665192 23d38083f6
commit 6fd95154bb
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
system/blueprints/pages/raw.yaml
View File

@@ -21,6 +21,7 @@ form:
frontmatter:
type: frontmatter
label: PLUGIN_ADMIN.FRONTMATTER
autofocus: true
content:
type: markdown

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

@@ -88,7 +88,7 @@ class Media extends Getters
$altMedium = $altMedium['file'];
$medium = MediumFactory::scaledFromMedium($altMedium, $ratio, 1);
$medium = MediumFactory::scaledFromMedium($altMedium, $ratio, 1)['file'];
}
if (!$medium) {
@@ -116,7 +116,7 @@ class Media extends Getters
continue;
}
$types['alternative'][$i] = MediumFactory::scaledFromMedium($alternatives[$max], $max, $i);
$types['alternative'][$i] = MediumFactory::scaledFromMedium($alternatives[$max]['file'], $max, $i);
}
foreach ($types['alternative'] as $ratio => $altMedium) {

2
system/src/Grav/Common/Page/Medium/MediumFactory.php
View File

@@ -140,6 +140,6 @@ class MediumFactory
$medium = self::fromFile($file);
$medium->set('size', $size);
return $medium;
return ['file' => $medium, 'size' => $size];
}
}