diff options
| author | Felix Favre <gnomus@gnomus.de> | 2014-08-24 15:52:25 +0200 |
|---|---|---|
| committer | Felix Favre <gnomus@gnomus.de> | 2014-08-24 15:52:25 +0200 |
| commit | 4faca9864f80dfd90cba248855602ab7680cab53 (patch) | |
| tree | 9f2d5d76adc7d14e89d51c0073103e9d7ad717f4 /public/index.php | |
| parent | efe853246f99c59e48ac66955b40fb7e09da0a5b (diff) | |
| parent | f9e577352dd31f2846c3a340a1de82dd73961568 (diff) | |
Merge branch 'master' of github.com:planetcyborg/engelsystem
Conflicts:
themes/theme1.scss
Diffstat (limited to 'public/index.php')
| -rw-r--r-- | public/index.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/public/index.php b/public/index.php index 5f33bb67..abe8d075 100644 --- a/public/index.php +++ b/public/index.php @@ -58,7 +58,6 @@ require_once ('includes/pages/user_news.php'); require_once ('includes/pages/user_questions.php'); require_once ('includes/pages/user_settings.php'); require_once ('includes/pages/user_shifts.php'); -require_once ('includes/pages/user_wakeup.php'); require_once ('vendor/parsedown-0.9.0/Parsedown.php'); @@ -169,9 +168,6 @@ if (isset($_REQUEST['p']) && preg_match("/^[a-z0-9_]*$/i", $_REQUEST['p']) && (i } elseif ($p == "user_questions") { $title = questions_title(); $content = user_questions(); - } elseif ($p == "user_wakeup") { - $title = wakeup_title(); - $content = user_wakeup(); } elseif ($p == "user_settings") { $title = settings_title(); $content = user_settings(); |