Merge branch 'release/5.0.3'

getgrav · Jun 15, 2021 · 7de0dee · 7de0dee
2 parents 16de542 + 48678f9
commit 7de0dee
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v5.0.3
+## 05/15/2021
+
+1. [](#improved)
+   * Removed the windows `\r\n` line breaks + extraneous escaping in `data.txt.twig`
+   * Use base64_encode filter rather than function
+
 # v5.0.2
 ## 04/23/2021
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Form
 slug: form
 type: plugin
-version: 5.0.2
+version: 5.0.3
 description: Enables the forms handling
 icon: check-square
 author:

diff --git a/composer.lock b/composer.lock
diff --git a/templates/forms/default/data.txt.twig b/templates/forms/default/data.txt.twig
@@ -9,13 +9,13 @@
         {%- if show_field %}
             {%- set value = form.value(scope ~ (field.name ?? index)) -%}
             {%- if value -%}
-            {{- field.label|t|e }}: {{ string(value is iterable ? value|json_encode : value|escape('yaml')) ~ "\r\n" }}
+            {{- field.label|t|e }}: {{ string(value is iterable ? value|json_encode : value) ~ "\n" }}
             {%- endif -%}
         {%- endif %}
     {%- endif %}
 {%- endfor %}
 {%- endmacro %}
 {%- import _self as macro %}
 {%- autoescape false %}
-{{- macro.render_field(form, form.fields, '') ~ "\r\n" }}
-{%- endautoescape %}
+{{- macro.render_field(form, form.fields, '') ~ "\n" }}
+{%- endautoescape %}
diff --git a/templates/forms/fields/file/file.html.twig b/templates/forms/fields/file/file.html.twig
@@ -32,17 +32,17 @@
         {% if type == 'pages' %}
             {% set blueprint_name = type ~ '/' ~ blueprint_name %}
         {% endif %}
-        {% set blueprint = base64_encode(blueprint_name) %}
+        {% set blueprint = blueprint_name|base64_encode %}
         {% set real_path = value.thumb ?? global.context.media[path].relativePath ?? global.form.getPagePathFromToken(path) %}
         {% set remove = global.form.getFileDeleteAjaxRoute(files.name, path)|string ?: uri.addNonce(
             global.base_url_relative ~
             '/media.json' ~
             '/task' ~ config.system.param_sep ~ 'removeFileFromBlueprint' ~
-            '/proute' ~ config.system.param_sep ~ base64_encode(route) ~
+            '/proute' ~ config.system.param_sep ~ route|base64_encode ~
             '/blueprint' ~ config.system.param_sep ~ blueprint ~
             '/type' ~ config.system.param_sep ~ type ~
             '/field' ~ config.system.param_sep ~ files.name ~
-            '/path' ~ config.system.param_sep ~ base64_encode(value.path), 'admin-form', 'admin-nonce') %}
+            '/path' ~ config.system.param_sep ~ value.path|base64_encode, 'admin-form', 'admin-nonce') %}
 
         {% set file = value|merge({remove: remove, path: value.thumb_url ?? (uri.rootUrl == '/' ? '/' : uri.rootUrl ~ '/' ~ real_path) }) %}
         <div class="hidden" data-file="{{ file|json_encode|e('html_attr') }}"></div>

diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
@@ -29,7 +29,7 @@ class InstalledVersions
     'aliases' => 
     array (
     ),
-    'reference' => '3eabc541329e2fc0b9fc2f23e5d5c58d5f0dbc15',
+    'reference' => 'd53d3124481c8a72f223c49a03e6fd9b1f5bd7ee',
     'name' => 'getgrav/grav-plugin-form',
   ),
   'versions' => 
@@ -41,7 +41,7 @@ class InstalledVersions
       'aliases' => 
       array (
       ),
-      'reference' => '3eabc541329e2fc0b9fc2f23e5d5c58d5f0dbc15',
+      'reference' => 'd53d3124481c8a72f223c49a03e6fd9b1f5bd7ee',
     ),
     'google/recaptcha' => 
     array (

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -56,6 +56,6 @@
             "install-path": "../google/recaptcha"
         }
     ],
-    "dev": true,
+    "dev": false,
     "dev-package-names": []
 }
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -6,7 +6,7 @@
     'aliases' => 
     array (
     ),
-    'reference' => '3eabc541329e2fc0b9fc2f23e5d5c58d5f0dbc15',
+    'reference' => 'd53d3124481c8a72f223c49a03e6fd9b1f5bd7ee',
     'name' => 'getgrav/grav-plugin-form',
   ),
   'versions' => 
@@ -18,7 +18,7 @@
       'aliases' => 
       array (
       ),
-      'reference' => '3eabc541329e2fc0b9fc2f23e5d5c58d5f0dbc15',
+      'reference' => 'd53d3124481c8a72f223c49a03e6fd9b1f5bd7ee',
     ),
     'google/recaptcha' => 
     array (

diff --git a/vendor/composer/platform_check.php b/vendor/composer/platform_check.php
@@ -4,8 +4,8 @@
 
 $issues = array();
 
-if (!(PHP_VERSION_ID >= 70103)) {
-    $issues[] = 'Your Composer dependencies require a PHP version ">= 7.1.3". You are running ' . PHP_VERSION . '.';
+if (!(PHP_VERSION_ID >= 70306)) {
+    $issues[] = 'Your Composer dependencies require a PHP version ">= 7.3.6". You are running ' . PHP_VERSION . '.';
 }
 
 if ($issues) {