Merge branch 'release/1.0.2'

Sommerregen · Nov 18, 2015 · 953587c · 953587c
2 parents f07d8d3 + 6175564
commit 953587c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,15 @@
+# v1.0.2
+## 11/18/2015
+
+2. [](#improved)
+  * Page specific options now respect the default configurations set in the admin panel
+  * `README.md` fixes
+
 # v1.0.1
 ## 11/17/2015
 
 3. [](#bugfix)
-  * Strips `[plugin:textformatter](..)` from content
+  * Strip Grav specific links like `[plugin:textformatter](..)` from content
 
 # v1.0.0
 ## 11/16/2015

diff --git a/README.md b/README.md
@@ -250,7 +250,7 @@ and use Twig instead, if necessary.
 You can pass arguments to the plugin filter, namely the same arguments as available in the [textformatter.yaml](textformatter.yaml) file. For example
 
 ```
-{{ page.content|textformatter({'bbcodes': false}) }}
+{{ page.content|textformatter({'bbcodes': {'enabled' : false}}) }}
 ```
 
 will disable the support for BBCodes.

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Text Formatter
-version: 1.0.1
+version: 1.0.2
 description: "This plugin is a wrapper for [TextFormatter](https://github.com/s9e/TextFormatter), a library that supports BBCode, HTML and other markup via plugin. It handles emoticons, censors words, automatically embeds media and more."
 icon: sticky-note
 author:

diff --git a/blueprints/textformatter.yaml b/blueprints/textformatter.yaml
@@ -21,7 +21,7 @@ form:
                   type: toggle
                   label: PLUGINS.TEXTFORMATTER.PROCESS
                   highlight: 1
-                  default: 1
+                  '@config-default': plugins.textformatter.process
                   options:
                     1: PLUGIN_ADMIN.YES
                     0: PLUGIN_ADMIN.NO

diff --git a/textformatter.php b/textformatter.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * TextFormatter v1.0.1
+ * TextFormatter v1.0.2
  *
  * This plugin is a wrapper for TextFormatter, a library that supports
  * BBCode, HTML and other markup via plugin. Handles emoticons, censors
@@ -10,7 +10,7 @@
  * http://benjamin-regler.de/license/
  *
  * @package     TextFormatter
- * @version     1.0.1
+ * @version     1.0.2
  * @link        <https://github.com/sommerregen/grav-plugin-textformatter>
  * @author      Benjamin Regler <sommerregen@benjamin-regler.de>
  * @copyright   2015, Benjamin Regler