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

Merge remote-tracking branch 'origin/1.6' into 1.6

Browse Source
This commit is contained in:
Matias Griese
2019-03-20 16:15:28 +02:00
parent 3836e4d38a 4ebfd51e98
commit 28d5be982c
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@ use Grav\Common\Page\Medium\AbstractMedia;
use Grav\Common\Page\Medium\GlobalMedia;
use Grav\Common\Page\Medium\MediumFactory;
use RocketTheme\Toolbox\File\File;
use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
class Media extends AbstractMedia
{
@@ -74,6 +75,8 @@ class Media extends AbstractMedia
*/
protected function init()
{
/** @var UniformResourceLocator $locator */
$locator = Grav::instance()['locator'];
$config = Grav::instance()['config'];
$exif_reader = isset(Grav::instance()['exif']) ? Grav::instance()['exif']->getReader() : false;
$media_types = array_keys(Grav::instance()['config']->get('media.types'));
@@ -157,8 +160,11 @@ class Media extends AbstractMedia
$meta_data = $meta->getData();
$meta_trimmed = array_diff_key($meta_data, array_flip($this->standard_exif));
if ($meta_trimmed) {
$full_meta_path = Grav::instance()['locator']->findResource($meta_path, true, true);
$file = File::instance($full_meta_path);
if ($locator->isStream($meta_path)) {
$file = File::instance(Grav::instance()['locator']->findResource($meta_path, true, true));
} else {
$file = File::instance($meta_path);
}
$file->save(Yaml::dump($meta_trimmed));
$types['meta']['file'] = $meta_path;
}

6
system/src/Grav/Common/Twig/TwigExtension.php
View File

@@ -450,6 +450,12 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
return (strpos($haystack, $needle) !== false);
}
/**
* Gets a human readable output for cron sytnax
*
* @param $at
* @return string
*/
public function niceCronFilter($at)
{
$cron = new Cron($at);