From 37a65efd89cb7dfadc2c50cce218c875d8cfc20b Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 26 Sep 2016 13:05:57 -0600 Subject: [PATCH] Fix for saving --- system/src/Grav/Common/GPM/Licenses.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/system/src/Grav/Common/GPM/Licenses.php b/system/src/Grav/Common/GPM/Licenses.php index b893db4ec..4f72bb26a 100644 --- a/system/src/Grav/Common/GPM/Licenses.php +++ b/system/src/Grav/Common/GPM/Licenses.php @@ -8,6 +8,7 @@ namespace Grav\Common\GPM; +use Grav\Common\Grav; use RocketTheme\Toolbox\File\YamlFile; class Licenses @@ -24,8 +25,7 @@ class Licenses */ public static function set($slug, $license) { - // TODO: this fails to save due to read-only stream apparently - $licenses = YamlFile::instance(self::$licenses); + $licenses = YamlFile::instance(self::getLicensePath()); $data = $licenses->content(); if (!is_string($license)) { @@ -49,14 +49,23 @@ class Licenses */ public static function get($slug) { - $licenses = YamlFile::instance(self::$licenses); + $licenses = YamlFile::instance(self::getLicensePath()); $data = $licenses->content(); $licenses->free(); + if (!$slug) { + return $data['licenses']; + } + if (!isset($data['licenses']) || !isset($data['licenses'][$slug])) { return ''; } return $data['licenses'][$slug]; } + + protected static function getLicensePath() + { + return Grav::instance()['locator']->findResource(self::$licenses); + } }