From 2e31df59dc686f14a5789abf03e83feb23a87eb0 Mon Sep 17 00:00:00 2001
From: elvill <elias.villiger@uzh.ch>
Date: Fri, 29 Jun 2018 09:05:41 +0200
Subject: [PATCH] Fix typos
---
extension/Documentation/Manual.rst | 4 ++--
extension/qfq/qfq/report/Report.php | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/extension/Documentation/Manual.rst b/extension/Documentation/Manual.rst
index 660b0da64..b8babbad7 100644
--- a/extension/Documentation/Manual.rst
+++ b/extension/Documentation/Manual.rst
@@ -3292,13 +3292,13 @@ An upload element is based on a 'file browse'-button and a 'trash'-button (=dele
The 'file browse'-button is displayed, if there is no file uploaded already.
The 'trash'-button is displayed, if there is a file uploaded already.
-After clicking on the browse brutton, the user select a file from the local filesystem.
+After clicking on the browse button, the user select a file from the local filesystem.
After choosing the file, the upload starts immediately, shown by a turning wheel. When the server received the whole file
and accepts (see below) the file, the 'file browse'-button disappears and the filename is shown, followed by a 'trash'-button.
Either the user is satisfied now or the user can delete the uploaded file (and maybe upload another one).
Until this point, the file is cached on the server but not copied to the `fileDestination`. The user have to save the
-current record, either to finalize the upload and/or to delete a previous uploaded file.
+current record, either to finalize the upload and/or to delete a previously uploaded file.
The FormElement behaves like a
diff --git a/extension/qfq/qfq/report/Report.php b/extension/qfq/qfq/report/Report.php
index 176d6e630..2f679c0f2 100644
--- a/extension/qfq/qfq/report/Report.php
+++ b/extension/qfq/qfq/report/Report.php
@@ -691,7 +691,6 @@ class Report {
$content = "";
$flagControl = false;
$flagOutput = true;
- $dummy = false;
// Special column name: '_...'? Empty column names are allowed: check with isset
if (isset($columnName[0]) && $columnName[0] === TOKEN_COLUMN_CTRL) {
--
GitLab