Merge branch 'master' into fix-use-scalar-value-error

This commit is contained in:
Sebastian Meyer 2023-03-15 21:01:59 +01:00 committed by GitHub
commit 4afe20f097
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 11 deletions

View File

@ -6,9 +6,6 @@ on:
branches: [ "master", "1.x", "2.x", "3.2.x", "3.3.x", "4.x" ]
pull_request:
branches: [ "master" ]
# Trigger analysis when a new release is drafted
release:
type: [ "created", "edited" ]
permissions:
contents: read
@ -34,7 +31,6 @@ jobs:
with:
# You can also omit the token and run the tools that support default configurations
project-token: ${{ secrets.CODACY_TOKEN }}
verbose: true
output: results.sarif
format: sarif
# Adjust severity of non-security issues

View File

@ -5,8 +5,6 @@ on:
branches: [ "master", "1.x", "2.x", "3.2.x", "3.3.x", "4.x" ]
pull_request:
branches: [ "master" ]
schedule:
- cron: "39 1 * * 1"
jobs:
analyze:

View File

@ -419,8 +419,10 @@ class NewTenantController extends AbstractController
{
if (isset($langArray[$lang][$index][0]['target'])) {
return $langArray[$lang][$index][0]['target'];
} else {
} elseif (isset($langArray['default'][$index][0]['target'])) {
return $langArray['default'][$index][0]['target'];
} else {
return 'Missing translation for ' . $index;
}
}
}

View File

@ -87,10 +87,12 @@
</f:if>
<f:if condition="{settings.datesearch}">
<label for="tx-dlf-search-dateFrom"><f:translate key="search.dateFrom"/>: </label>
<f:form.textfield type="date" property="dateFrom" value="{lastSearch.dateFrom}" class="tx-dlf-search-datesearch" id="tx-dlf-search-dateFrom"/>
<label for="tx-dlf-search-dateTo"><f:translate key="search.dateTo"/>: </label>
<f:form.textfield type="date" property="dateTo" value="{lastSearch.dateTo}" class="tx-dlf-search-datesearch" id="tx-dlf-search-dateTo"/>
<div class="tx-dlf-search-date">
<label for="tx-dlf-search-dateFrom"><f:translate key="search.dateFrom"/>: </label>
<f:form.textfield type="date" property="dateFrom" value="{lastSearch.dateFrom}" class="tx-dlf-search-datesearch" id="tx-dlf-search-dateFrom"/>
<label for="tx-dlf-search-dateTo"><f:translate key="search.dateTo"/>: </label>
<f:form.textfield type="date" property="dateTo" value="{lastSearch.dateTo}" class="tx-dlf-search-datesearch" id="tx-dlf-search-dateTo"/>
</div>
</f:if>
<f:form.hidden property="orderBy" value="{lastSearch.orderBy}" />