Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix customreports.lib.php #31771

Merged
merged 9 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions build/phpstan/phpstan-baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -17930,21 +17930,6 @@ parameters:
count: 1
path: ../../htdocs/opensurvey/results.php

-
message: "#^Parameter \\#4 \\$month of function dol_mktime expects int, array\\|string given\\.$#"
count: 1
path: ../../htdocs/opensurvey/wizard/create_survey.php

-
message: "#^Parameter \\#5 \\$day of function dol_mktime expects int, array\\|string given\\.$#"
count: 1
path: ../../htdocs/opensurvey/wizard/create_survey.php

-
message: "#^Parameter \\#6 \\$year of function dol_mktime expects int, array\\|string given\\.$#"
count: 1
path: ../../htdocs/opensurvey/wizard/create_survey.php

-
message: "#^Variable \\$allow_comments might not be defined\\.$#"
count: 1
Expand Down
4 changes: 2 additions & 2 deletions htdocs/core/lib/customreports.lib.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
/* Copyright (C) 2024 Laurent Destailleur <[email protected]>
/* Copyright (C) 2024 Laurent Destailleur <[email protected]>
* Copyright (C) 2024 Frédéric France <[email protected]>
* Copyright (C) 2024 MDW <[email protected]>
*
Expand Down Expand Up @@ -591,7 +591,7 @@ function fillArrayOfFilterFields($object, $tablealias, $labelofobject, &$arrayof
'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key] + ($count * 100000),
'table' => $object->table_element,
'tablefromt' => $tablepath,
'type' => $val['type'] // TODO: Check this, seems a copy/paste error
'type' => $extrafields->attributes[$object->table_element]['type'][$key],
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion htdocs/opensurvey/wizard/create_survey.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
$testdate = false;
$champdatefin = (int) dol_mktime(23, 59, 59, GETPOSTINT('champdatefinmonth'), GETPOSTINT('champdatefinday'), GETPOSTINT('champdatefinyear'));

if ($champdatefin > 0) { // A date was provided, $error still 0 here
if ($champdatefin > 0) { // A date was provided
// Expire date is not before today
if ($champdatefin >= dol_now()) {
$testdate = true;
Expand Down
Loading