From 25ff1241d4e153feb2588fb3703a29497df8d470 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 19 Mar 2019 13:14:21 -0600
Subject: [PATCH 1/2] docblock

---
 system/src/Grav/Common/Twig/TwigExtension.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/system/src/Grav/Common/Twig/TwigExtension.php b/system/src/Grav/Common/Twig/TwigExtension.php
index ab15a8869..f266b5132 100644
--- a/system/src/Grav/Common/Twig/TwigExtension.php
+++ b/system/src/Grav/Common/Twig/TwigExtension.php
@@ -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);

From 4ebfd51e989197cbd3c97996dd867bd62c744b0c Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Wed, 20 Mar 2019 07:22:05 -0600
Subject: [PATCH 2/2] Safer stream check

---
 system/src/Grav/Common/Page/Media.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/system/src/Grav/Common/Page/Media.php b/system/src/Grav/Common/Page/Media.php
index 8715c6087..cc21ef34e 100644
--- a/system/src/Grav/Common/Page/Media.php
+++ b/system/src/Grav/Common/Page/Media.php
@@ -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;
                     }