MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Marijn button #99

Merged
11166932 merged 152 commits from marijn-button into master 2017-01-23 13:25:08 +01:00
Conversation 2 Commits 152 Files Changed 52 -7
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit daff2f41fa - Show all commits

7
website/views/adminpanel.php
View File

@@ -99,15 +99,8 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
changeMultipleGroupStatusByID($db, $_POST["checkbox-group"], $_POST["groupbatchactions"]);
}
<<<<<<< HEAD
if (isset($_POST["pageselect"])) {
$currentpage = $_POST["pageselect"];
=======
if (!empty($_POST["actions"]) && !empty($_POST["userID"])) {
changeUserStatusByID($_POST["userID"], $_POST["actions"]);
} elseif (!empty($_POST["actions"]) && !empty($_POST["groupID"])) {
changeGroupStatusByID($_POST["groupID"], $_POST["actions"]);
>>>>>>> master
}
}