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

# Conflicts: # CHANGELOG.md # composer.json # composer.lock # system/defines.php
getgrav · Mar 25, 2019 · 5fbd252 · 5fbd252
2 parents 84d9953 + 04d3237
commit 5fbd252
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -258,6 +258,18 @@
     * Doctrine filecache is now namespaced with prefix to support purging
     * Register all page types into `blueprint://pages` stream
 
+# v1.5.11
+## mm/dd/2019
+
+1. [](#improved)
+    *  Add the page to onMarkdownInitialized event [#2412](https://github.com/getgrav/grav/issues/2412)
+
+# v1.5.10
+## 03/21/2019
+
+1. [](#new)
+    * Added new `deferred` Twig extension
+
 # v1.5.9
 ## 03/20/2019
 

diff --git a/README.md b/README.md
@@ -106,6 +106,7 @@ If you discover a possible security issue related to Grav or one of its plugins,
 * Dive into more [advanced](https://learn.getgrav.org/advanced) functions
 * Learn about the [Grav CLI](https://learn.getgrav.org/cli-console/grav-cli)
 * Review examples in the [Grav Cookbook](https://learn.getgrav.org/cookbook)
+* More [Awesome Grav Stuff](https://github.com/getgrav/awesome-grav)
 
 # Backers
 Support Grav with a monthly donation to help us continue development. [[Become a backer](https://opencollective.com/grav#backer)]

diff --git a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
@@ -48,7 +48,7 @@ protected function init($page, $defaults)
         $this->setMarkupEscaped($defaults['escape_markup']);
         $this->setSpecialChars($defaults['special_chars']);
 
-        $grav->fireEvent('onMarkdownInitialized', new Event(['markdown' => $this]));
+        $grav->fireEvent('onMarkdownInitialized', new Event(['markdown' => $this, 'page' => $page]));
 
     }