diff options
author | Felix Favre <gnomus@gnomus.de> | 2014-12-06 22:46:40 +0100 |
---|---|---|
committer | Felix Favre <gnomus@gnomus.de> | 2014-12-06 22:46:40 +0100 |
commit | 45ac884474753313b79e1f78934b18ae05253055 (patch) | |
tree | 887e478e002228c5e1828061f7885b160e4720cf /includes/pages | |
parent | 921449f3efd2a7ba39009452dc4c4954109e221d (diff) | |
parent | a48fd8fc37f75222a680e78c6ade8c41f02c3e6e (diff) |
Merge branch 'master' of github.com:engelsystem/engelsystem
Diffstat (limited to 'includes/pages')
-rw-r--r-- | includes/pages/admin_news.php | 2 | ||||
-rw-r--r-- | includes/pages/admin_questions.php | 2 | ||||
-rw-r--r-- | includes/pages/admin_user.php | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/includes/pages/admin_news.php b/includes/pages/admin_news.php index a83e0d70..0653a045 100644 --- a/includes/pages/admin_news.php +++ b/includes/pages/admin_news.php @@ -5,7 +5,7 @@ function admin_news() { if (! isset($_GET["action"])) { redirect(page_link_to("news")); } else { - $html = '<div class="col-md-12"><h1>' . _("Edit news entry") . '</h1>'; + $html = '<div class="col-md-12"><h1>' . _("Edit news entry") . '</h1>' . msg(); if (isset($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id'])) $id = $_REQUEST['id']; else diff --git a/includes/pages/admin_questions.php b/includes/pages/admin_questions.php index 97aeec4b..6d141251 100644 --- a/includes/pages/admin_questions.php +++ b/includes/pages/admin_questions.php @@ -10,7 +10,7 @@ function admin_new_questions() { $new_messages = sql_num_query("SELECT * FROM `Questions` WHERE `AID` IS NULL"); if ($new_messages > 0) - info('<a href="' . page_link_to("admin_questions") . '">Es gibt unbeantwortete Fragen!</a>'); + return info('<a href="' . page_link_to("admin_questions") . '">' . _('There are unanswered questions!') . '</a>', true); } return ""; diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php index b2275b52..87190857 100644 --- a/includes/pages/admin_user.php +++ b/includes/pages/admin_user.php @@ -264,6 +264,7 @@ function admin_user() { } } } else { + msg(); redirect(page_link_to('users')); } |