Skip to content

Commit

Permalink
fix patchfile for token_bar.php
Browse files Browse the repository at this point in the history
  • Loading branch information
xoxys committed Oct 5, 2020
1 parent 1a1af49 commit 29e5da0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \

# Database migrations work for releases from 4.x.x on upwards. From 4.x.x to 5.x.x testing is neccesary!!!!
# Migrations from 3.x.x to 4.x.x break the underlying yii framework.
ARG BUILD_VERSION=4.3.5+200721
ENV SURVEY_VERSION="${BUILD_VERSION:-4.3.5+200721}"
ARG BUILD_VERSION=4.3.18+200928
ENV SURVEY_VERSION="${BUILD_VERSION:-4.3.18+200928}"

ENV SURVEY_ADMIN_USER=admin
ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so php-fpm7 php"
Expand Down
14 changes: 8 additions & 6 deletions overlay/token_bar.patch
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
--- token_bar.php.original 2020-07-24 10:35:43.540889910 +0200
+++ token_bar.php 2020-07-24 11:16:22.740141644 +0200
@@ -211,7 +211,7 @@
diff --git a/application/views/admin/survey/topbar/token_bar.php b/application/views/admin/survey/topbar/token_bar.php
index 922873c76f..fc905490ed 100644
--- a/application/views/admin/survey/topbar/token_bar.php
+++ b/application/views/admin/survey/topbar/token_bar.php
@@ -211,7 +211,7 @@ if (!$onlyclose) {
$isDisabled = true;
}

- if (($oSurvey->bounceprocessing != 'N' || ($oSurvey->bounceprocessing == 'G' && getGlobalSetting('bounceaccounttype') != 'off'))) {
- if (!($oSurvey->bounceprocessing != 'N' || ($oSurvey->bounceprocessing == 'G' && getGlobalSetting('bounceaccounttype') != 'off'))) {
+ if (($oSurvey->bounceprocessing == 'N' || ($oSurvey->bounceprocessing == 'G' && getGlobalSetting('bounceaccounttype') == 'off'))) {
$errorMessages[] = gT("Bounce processing is deactivated either application-wide or for this survey in particular.");
$isDisabled = true;
}
@@ -219,11 +219,10 @@
@@ -219,11 +219,10 @@ if (!$onlyclose) {
$errorMessage = join("\n", $errorMessages);

$buttons['bounce_processing'] = [
Expand All @@ -22,7 +24,7 @@
'name' => gT('Start bounce processing'),
'class' => 'pjax ' . ($isDisabled ? ' disabled' : ' '),
];
@@ -276,7 +275,7 @@
@@ -276,7 +275,7 @@ if (!$onlyclose) {

###### Right aligned

Expand Down

0 comments on commit 29e5da0

Please sign in to comment.