Merge branch 'master' into 'b9329-annotations'

# Conflicts:
#   .gitlab-ci.yml

Documentation/Manual.rst

@@ -1937,7 +1937,7 @@ Store: *VARS* - V
 The directive `fillStoreVar` will fill the store VARS with custom values. Existing Store VARS values will be merged together with them.
 E.g.: ::
 
-    fillStoreVar = {{SELECT p.name, p.email FROM Person AS p WHERE p.id={{pId:S}} }}
+    fillStoreVar = {{! SELECT p.name, p.email FROM Person AS p WHERE p.id={{pId:S}} }}
 
 * After filling the store, the values can be retrieved via `{{name:V}}` and `{{email:V}}`.
 * Be careful by specifying general purpose variables like `id`, `r`, `pageId` and so on. This might conflict with existing variables.
@@ -4704,7 +4704,7 @@ On `Form.parameter` define a `fillStoreVar` query with a column name equal to a
 Example: ::
 
   FormElement.name = technicalContact
-  Form.parameter.fillStoreVar = {{SELECT CONCAT(p.firstName, ' ', p.name) AS technicalContact FROM Person AS p WHERE p.account='{{feUser:T}}' }}
+  Form.parameter.fillStoreVar = {{! SELECT CONCAT(p.firstName, ' ', p.name) AS technicalContact FROM Person AS p WHERE p.account='{{feUser:T}}' }}
 
 What we use here is the default STORE prio FSRVD. If the form loads with r=0, 'F', 'S' and 'R' are empty. 'V' is filled.
 If r>0, than 'F' and 'S' are empty and 'R' is filled.

extension/Classes/Core/Helper/DownloadPage.php

@@ -52,19 +52,19 @@ class DownloadPage {
                 "verify_peer" => false,
                 "verify_peer_name" => false,
             ),
+            'http' => array(
+                'timeout' => 1200,
+            ),
         );
 
         if (isset($_COOKIE[SESSION_NAME])) {
-            $cookie = array(
+            $cookie_http = array(
                 // Copy cookie: to forward current QFQ user session
-                'http' => array(
-                    'method' => "GET",
-                    'header' => "Accept-language: en\r\n" .
-                        "Cookie: " . SESSION_NAME . "=" . $_COOKIE[SESSION_NAME] . "\r\n",
-                    'timeout' => 600,
-                ),
+                'method' => "GET",
+                'header' => "Accept-language: en\r\n" .
+                    "Cookie: " . SESSION_NAME . "=" . $_COOKIE[SESSION_NAME] . "\r\n",
             );
-            $ctx = array_merge($ctx,$cookie);
+            $ctx['http'] = array_merge($ctx['http'],$cookie_http);
         }
 
         // The current session needs to be closed, cause the SESSION needs to be opened again by processing get_file_contents()

javascript/src/QfqForm.js

@@ -60,7 +60,7 @@ var QfqNS = QfqNS || {};
         };
 
         if (!!$('#' + QfqNS.escapeJqueryIdSelector(this.formId)).data('enable-save-button')) {
-            this.form = new n.Form(this.formId, true);
+            this.form = new n.Form(this.formId, false);
             this.getSaveButton().removeClass("disabled").removeAttr("disabled");
         } else {
             this.getSaveButton().addClass("disabled").attr("disabled", "disabled");