Merge branch 'release/3.0.8'

getgrav · Apr 27, 2020 · 8ebf026 · 8ebf026
2 parents 6bfad9d + fa0eab1
commit 8ebf026
Show file tree

Hide file tree

Showing 17 changed files with 200 additions and 68 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v3.0.8
+## 04/27/2020
+
+1. [](#improved)
+    * Updated vendor library files
+    * Use Grav's Parsedown class
+
 # v3.0.7
 ## 03/05/2020
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,7 @@
 name: Email
-version: 3.0.7
+slug: email
+type: plugin
+version: 3.0.8
 testing: false
 description: Enables the emailing system for Grav
 icon: envelope

diff --git a/classes/Email.php b/classes/Email.php
@@ -4,6 +4,7 @@
 use Grav\Common\Config\Config;
 use Grav\Common\Grav;
 use Grav\Common\Language\Language;
+use Grav\Common\Markdown\Parsedown;
 use Grav\Common\Twig\Twig;
 use Grav\Framework\Form\Interfaces\FormInterface;
 use \Monolog\Logger;
@@ -178,7 +179,7 @@ public function buildMessage(array $params, array $vars = [])
                         $body = $twig->processString($value, $vars);
 
                         if ($params['process_markdown']) {
-                            $parsedown = new \Parsedown();
+                            $parsedown = new Parsedown();
                             $body = $parsedown->text($body);
                         }
 
@@ -202,7 +203,7 @@ public function buildMessage(array $params, array $vars = [])
                             $body = !empty($body_part['body']) ? $twig->processString($body_part['body'], $vars) : null;
 
                             if ($params['process_markdown']) {
-                                $parsedown = new \Parsedown();
+                                $parsedown = new Parsedown();
                                 $body = $parsedown->text($body);
                             }
 

diff --git a/composer.lock b/composer.lock
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -13,6 +13,9 @@ public static function loadClassLoader($class)
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,9 @@ public static function loadClassLoader($class) @@
             }
         }
+        /**
+         * @return \Composer\Autoload\ClassLoader
+         */
         public static function getLoader()
         {
             if (null !== self::$loader) {
@@ Expand Down @@