Merge branch 'develop' of https://github.com/getgrav/grav-plugin-admin into develop

CHANGELOG.md

@@ -1,9 +1,17 @@
+# v1.2.13
+## 02/xx/2017
+
+1. [](#bugfix)
+    * Fix issue with validating page when switching language [#963](https://github.com/getgrav/grav-plugin-admin/issues/963)
+    * Fix issue with quotes in Admin strings used in JS [#965](https://github.com/getgrav/grav-plugin-admin/issues/965)
+    * Force GPM::getUpdates call to json extension, in order to properly get back JSON response in case of error [#980](https://github.com/getgrav/grav-plugin-admin/issues/980)
+
 # v1.2.12
 ## 02/12/2017
 
 1. [](#bugfix)
     * Rebuilt the JS bundle to address various JS-related issues that cropped up in `v1.2.11`
-    * Fixed Firefox Network Error issue when updating multiple plugins/themes at concurrently [#1301](https://github.com/getgrav/grav-plugin-admin/issues/1301)
+    * Fixed Firefox Network Error issue when updating multiple plugins/themes at concurrently [#1301](https://github.com/getgrav/grav/issues/1301)
 
 # v1.2.11
 ## 02/10/2017

admin.php

@@ -690,7 +690,7 @@ class AdminPlugin extends Plugin
 
         foreach ($strings as $string) {
             $separator = (end($strings) === $string) ? '' : ',';
-            $translations .= '"' . $string . '": "' . $this->admin->translate('PLUGIN_ADMIN.' . $string) . '"' . $separator;
+            $translations .= '"' . $string . '": "' . htmlspecialchars($this->admin->translate('PLUGIN_ADMIN.' . $string)) . '"' . $separator;
         }
 
         $translations .= '};';

classes/admincontroller.php

@@ -2039,6 +2039,7 @@ class AdminController extends AdminBaseController
             $aPage->init(new \SplFileInfo($path), $language . '.md');
             $aPage->header($obj->header());
             $aPage->rawMarkdown($obj->rawMarkdown());
+            $aPage->template($obj->template());
             $aPage->validate();
             $aPage->filter();
             $aPage->save();

themes/grav/app/utils/gpm.js

@@ -35,7 +35,7 @@ export default class GPM extends EventEmitter {
 
         this.emit('fetching', this);
 
-        fetch(config.base_url_relative, {
+        fetch(`${config.base_url_relative}.json`, {
             credentials: 'same-origin',
             method: 'post',
             body: data