Merge branch 'bugfix-de_DE' into 'master'
Bugfix + Trad de_DE - manque `global $config;` dans `ajouter_sondage()` pour que les mails puissent partir - bug avec des horaires vides mal interprétés (entraîne une erreur 502) - ajout de la traduction allemande See merge request !27
This commit is contained in:
commit
6909722fad
@ -871,7 +871,7 @@ if (substr($dsondage->format, 0, 1)=="D") {
|
|||||||
|
|
||||||
// Hours
|
// Hours
|
||||||
$rbd = ($border[$i]) ? ' rbd' : '';
|
$rbd = ($border[$i]) ? ' rbd' : '';
|
||||||
if ($horoCur[1] !== "") {
|
if (isset($horoCur[1]) && $horoCur[1] !== "") {
|
||||||
$tr_hours .= '<th class="bg-info'.$rbd.'" id="H'.$i.'" title="'.$horoCur[1].'">'.$horoCur[1].'</th>';
|
$tr_hours .= '<th class="bg-info'.$rbd.'" id="H'.$i.'" title="'.$horoCur[1].'">'.$horoCur[1].'</th>';
|
||||||
$radio_title[$i] .= ' - '.$horoCur[1];
|
$radio_title[$i] .= ' - '.$horoCur[1];
|
||||||
$td_headers[$i] .= ' H'.$i;
|
$td_headers[$i] .= ' H'.$i;
|
||||||
|
@ -41,6 +41,7 @@ function random($car)
|
|||||||
function ajouter_sondage()
|
function ajouter_sondage()
|
||||||
{
|
{
|
||||||
global $connect;
|
global $connect;
|
||||||
|
global $config;
|
||||||
|
|
||||||
$sondage=random(16);
|
$sondage=random(16);
|
||||||
$sondage_admin=$sondage.random(8);
|
$sondage_admin=$sondage.random(8);
|
||||||
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@ -366,7 +366,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+"||$dsondage->format=="D-") {
|
|||||||
|
|
||||||
// Hours
|
// Hours
|
||||||
$rbd = ($border[$i]) ? ' rbd' : '';
|
$rbd = ($border[$i]) ? ' rbd' : '';
|
||||||
if ($horoCur[1] !== "") {
|
if (isset($horoCur[1]) && $horoCur[1] !== "") {
|
||||||
$tr_hours .= '<th class="bg-info'.$rbd.'" id="H'.$i.'" title="'.$horoCur[1].'">'.$horoCur[1].'</th>';
|
$tr_hours .= '<th class="bg-info'.$rbd.'" id="H'.$i.'" title="'.$horoCur[1].'">'.$horoCur[1].'</th>';
|
||||||
$radio_title[$i] .= ' - '.$horoCur[1];
|
$radio_title[$i] .= ' - '.$horoCur[1];
|
||||||
$td_headers[$i] .= ' H'.$i;
|
$td_headers[$i] .= ' H'.$i;
|
||||||
|
Loading…
Reference in New Issue
Block a user