From e9c11bbef26030557e8a40307cf4dd931351d678 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Wed, 28 Jun 2017 11:50:39 +0300 Subject: [PATCH] Fixed global media files disappearing after a reload (#1545) --- CHANGELOG.md | 6 ++++++ system/src/Grav/Common/Page/Media.php | 13 ++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25f3e9c71..9aab9aa73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.3.0-rc.5 +## mm/dd/2017 + +1. [](#bugfix) + * Fixed global media files disappearing after a reload (#1545) + # v1.3.0-rc.4 ## 06/22/2017 diff --git a/system/src/Grav/Common/Page/Media.php b/system/src/Grav/Common/Page/Media.php index 0a76a2bb7..e83ec77df 100644 --- a/system/src/Grav/Common/Page/Media.php +++ b/system/src/Grav/Common/Page/Media.php @@ -30,12 +30,19 @@ class Media extends AbstractMedia { $this->path = $path; + $this->__wakeup(); + $this->init(); + } + + /** + * Initialize static variables on unserialize. + */ + public function __wakeup() + { if (!isset(static::$global)) { // Add fallback to global media. - static::$global = new GlobalMedia($path); + static::$global = new GlobalMedia(); } - - $this->init(); } /**