Merge branch 'release/1.8.5'

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v1.8.5
+## 06/19/2018
+
+1. [](#bugfix)
+    * Fixed broken folder attribute on filepicker [#1465](https://github.com/getgrav/grav-plugin-admin/issues/1465)
+    * Added translation for system.session.initialize
+    * Slight updates on new translation strings
+
 # v1.8.4
 ## 06/11/2018
 

classes/adminbasecontroller.php

@@ -751,7 +751,7 @@ class AdminBaseController
             return false;
         }
 
-        if ($data instanceof Data) {
+        if (method_exists($data, 'blueprints')) {
             $settings = $data->blueprints()->schema()->getProperty($this->post['name']);
         } elseif (method_exists($data, 'getBlueprint')) {
             $settings = $data->getBlueprint()->schema()->getProperty($this->post['name']);
@@ -760,7 +760,7 @@ class AdminBaseController
         if (isset($settings['folder'])) {
             $folder = $settings['folder'];
         } else {
-            $folder = '@self';
+            $folder = 'self@';
         }
 
         // Do not use self@ outside of pages

languages/en.yaml

@@ -714,3 +714,5 @@ PLUGIN_ADMIN:
   ROUTE_ALIASES: "Route Aliases"
   OPEN_NEW_TAB: "Open in new tab"
   PAGEMEDIA_RESIZER: "> The following settings apply to images uploaded through the page media. Resize Width / Height will automatically resize down and proportionally an image if exceeds the limits set in the inputs. Resolution min and max values define the size ranges for uploaded images. Set the fields to 0 to prevent any manipulation."
+  SESSION_INITIALIZE: "Initialize Session"
+  SESSION_INITIALIZE_HELP: "Makes Grav to start a session. This feature is needed to make any user interaction to work, such as login, forms etc. Admin plugin isn't affected by this setting."