diff options
| author | Horus3 | 2016-09-28 14:43:44 +0200 |
|---|---|---|
| committer | Horus3 | 2016-09-28 14:43:44 +0200 |
| commit | 6decb91aa4cc27c83c866d1b128dc719aeb1c986 (patch) | |
| tree | 477a08f5296bbf4ab75b53893b25f900b6e0ad8f /intern/api/termine.php | |
| parent | 4c39424720d6be708896f42b73a93df3c2637a10 (diff) | |
| parent | 006da29841a225675fc7dc4981b69336409737e1 (diff) | |
| download | gospeladlershof.de-6decb91aa4cc27c83c866d1b128dc719aeb1c986.tar.gz | |
Merge branch 'master' of git.iamfabulous.de:gospeladlershof.de
Diffstat (limited to 'intern/api/termine.php')
| -rw-r--r-- | intern/api/termine.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/api/termine.php b/intern/api/termine.php index 97059a8..3b0658d 100644 --- a/intern/api/termine.php +++ b/intern/api/termine.php @@ -11,11 +11,13 @@ if ( false === $db ) { exit; } -$res = $db->query('select termin, uhrzeit from proben where date(STR_TO_DATE(termin, "%d.%m.%Y")) > (SELECT CURDATE() );'); +$res = $db->query('select termin, uhrzeit from proben where date(STR_TO_DATE(termin, "%d.%m.%Y")) > (SELECT CURDATE() ) ORDER BY date(STR_TO_DATE(termin, "%d.%m.%Y"));'); $proben = $res->fetchAll(PDO::FETCH_ASSOC); $res = $db->query('select termin,uhrzeit,beschreibung,anfahrt from konzert order by id desc limit 1;'); $konzert = $res->fetchAll(PDO::FETCH_ASSOC); +$konzert[0]["beschreibung"] = str_replace("<strong>", "**", str_replace("</strong>", "**", $konzert[0]["beschreibung"])); + #$output = array("konzert" => $konzert, "proben" => $proben, "build" => date("d.m.Y H:i:s")); $output = array("konzert" => $konzert, "proben" => $proben, "build" => date("Y-m-d H:i:s")); $data = json_encode($output, JSON_PRETTY_PRINT); |