Skip to content
Snippets Groups Projects
Commit c9f09261 authored by 2deep4real's avatar 2deep4real
Browse files

revert merge

parent d15dcca6
Branches
No related tags found
No related merge requests found
css/design.css 100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File mode changed from 100644 to 100755
{ {
"max":"20", "max":"20",
"stops": [ "stops": [
"Dortmund:Universität S", "Dortmund:Universität S",
"Dortmund:Joseph-von-Fraunhofer Straße", "Dortmund:Joseph-von-Fraunhofer Straße",
"Dortmund:Meitnerweg" "Dortmund:Meitnerweg"
], ],
"filter": { "filter": {
"bl": { "bl": {
"type": [ "type": [
"H-Bahn" "H-Bahn"
], ],
"destination" : [ "destination": [
"Dortmund Otto-Hahn-Straße" "Dortmund Otto-Hahn-Straße"
} ]
} }
} }
} }
\ No newline at end of file
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
} }
if (count($options['stops']) == 0) { if (count($options['stops']) == 0) {
$result['error'] = 'no stops defined'; $result['error'] = 'no stops defined';
$result['config']['name'] = $_GET['config']; $result['config']['name'] = $config_name;
$result['config']['type'] = 'panel/departure'; $result['config']['type'] = 'panel/departure';
$result['options'] = $options; $result['options'] = $options;
echo json_encode($result); echo json_encode($result);
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
} }
} else { } else {
$result['error'] = 'no config defined'; $result['error'] = 'no config defined';
$result['config']['name'] = ''; $result['config']['name'] = $config_name;
$result['config']['type'] = 'panel/departure'; $result['config']['type'] = 'panel/departure';
$result['options'] = $options; $result['options'] = $options;
echo json_encode($result); echo json_encode($result);
......
File mode changed from 100644 to 100755
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment