Merge /media/sdb1/gitRepositories/judo into promoInfo

Conflicts:
	homepage/redesign2018/markdownExperiment/wkParticipo/login.php
This commit is contained in:
marko
2019-03-01 09:00:07 +01:00
101 changed files with 4348 additions and 3162 deletions

View File

@@ -34,7 +34,7 @@
"Neue Fahrt für eventId " . $_POST['f']['eventId'] . " mit " . $_POST['f']['anzPlaetze'] . " hinzugefügt";
$userData = getUserData($mysqli, $_SESSION['user']['userId']);
$eventData = getEventData($mysqli, $_POST['f']['eventId']);
$eventData = getWkEventData($mysqli, $_POST['f']['eventId']);
$wkData = getWkData($mysqli, $eventData['wkId']);
$notificationMail['to'] = $userData['eMail'];
@@ -75,7 +75,7 @@
$message['error'] = 'Datenbankverbindung fehlgeschlagen: ' . $mysqli->connect_error;
}
$eventData = getEventData($mysqli, $_POST['f']['eventId']);
$eventData = getWkEventData($mysqli, $_POST['f']['eventId']);
$wkData = getWkData($mysqli, $eventData['wkId']);
?>
<div id="meldungsBox">