Merge branch 'release/1.4.1'

Sommerregen · Nov 18, 2015 · c99bf3f · c99bf3f
2 parents 9c882da + 39cd6b6
commit c99bf3f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.4.1
+## 11/18/2015
+
+2. [](#improved)
+  * Page specific options now respect the default configurations set in the admin panel
+
 # v1.4.0
 ## 11/17/2015
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: External Links
-version: 1.4.0
+version: 1.4.1
 description: "This plugin adds small icons to external and mailto links, informing users the link will take them to a new site or open their email client."
 icon: external-link
 author:

diff --git a/blueprints/external_links.yaml b/blueprints/external_links.yaml
@@ -21,7 +21,7 @@ form:
                   type: toggle
                   label: PLUGINS.EXTERNAL_LINKS.PROCESS
                   highlight: 1
-                  default: 1
+                  '@config-default': plugins.external_links.process
                   options:
                     1: PLUGIN_ADMIN.YES
                     0: PLUGIN_ADMIN.NO
@@ -31,7 +31,7 @@ form:
                 header.external_links.title:
                   type: toggle
                   label: PLUGINS.EXTERNAL_LINKS.TITLE
-                  default: 0
+                  '@config-default': plugins.external_links.title
                   options:
                     1: PLUGIN_ADMIN.YES
                     0: PLUGIN_ADMIN.NO
@@ -41,7 +41,7 @@ form:
                 header.external_links.no_follow:
                   type: toggle
                   label: PLUGINS.EXTERNAL_LINKS.NO_FOLLOW
-                  default: 1
+                  '@config-default': plugins.external_links.no_follow
                   options:
                     1: PLUGIN_ADMIN.YES
                     0: PLUGIN_ADMIN.NO
@@ -52,7 +52,7 @@ form:
                   type: select
                   size: large
                   label: PLUGINS.EXTERNAL_LINKS.TARGET
-                  default: _blank
+                  '@config-default': plugins.external_links.target
                   placeholder: _blank
                   selectize:
                     create: true
@@ -70,7 +70,7 @@ form:
                   classes: fancy
                   label: PLUGINS.EXTERNAL_LINKS.MODE
                   help: PLUGINS.EXTERNAL_LINKS.MODE_HELP
-                  default: active
+                  '@config-default': plugins.external_links.mode
                   options:
                     active: PLUGINS.EXTERNAL_LINKS.MODE_ACTIVE
                     passive: PLUGINS.EXTERNAL_LINKS.MODE_PASSIVE

diff --git a/external_links.php b/external_links.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * External Links v1.4.0
+ * External Links v1.4.1
  *
  * This plugin adds small icons to external and mailto links, informing
  * users the link will take them to a new site or open their email client.
@@ -9,7 +9,7 @@
  * http://benjamin-regler.de/license/
  *
  * @package     External Links
- * @version     1.4.0
+ * @version     1.4.1
  * @link        <https://github.com/sommerregen/grav-plugin-external-links>
  * @author      Benjamin Regler <[email protected]>
  * @copyright   2015, Benjamin Regler
@@ -106,7 +106,7 @@ public function onBuildPagesInitialized()
   }
 
   /**
-   * Extend page blueprints with textformatter configuration options.
+   * Extend page blueprints with ExternalLinks configuration options.
    *
    * @param Event $event
    */
@@ -189,8 +189,6 @@ public function externalLinksFilter($content, $params = [])
     $page = func_num_args() > 2 ? func_get_arg(2) : $this->grav['page'];
     $config = $this->mergeConfig($page, true, $params);
 
-    $this->grav['debugger']->addMessage($params);
-
     // Render
     return $this->init()->render($content, $config, $page);
   }