From 52a4822477432218965aff2bf0b9b15018f4112e Mon Sep 17 00:00:00 2001
From: Hendrik <hendrik.huang@student.uva.nl>
Date: Tue, 31 Jan 2017 16:20:02 +0100
Subject: [PATCH] post-merge fix

---
 website/public/API/adminSearchUsers.php | 2 +-
 website/views/adminpanel-table.php      | 2 +-
 website/views/adminpanel.php            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/public/API/adminSearchUsers.php b/website/public/API/adminSearchUsers.php
index 58b170a..5f7944b 100644
--- a/website/public/API/adminSearchUsers.php
+++ b/website/public/API/adminSearchUsers.php
@@ -33,7 +33,7 @@ if (isset($_POST['groupstatus'])) {
     $groupstatus = $_POST["groupstatus"];
 }
 
-$userinfo = getRoleByID($_SESSION['userID'])->fetch(PDO::FETCH_ASSOC);
+$userinfo = getRoleByID($_SESSION['userID']);
 
 if ($pagetype == "user") {
     include ("../../views/adminpanel-table.php");
diff --git a/website/views/adminpanel-table.php b/website/views/adminpanel-table.php
index 9e6b9bc..3ae5da4 100644
--- a/website/views/adminpanel-table.php
+++ b/website/views/adminpanel-table.php
@@ -50,7 +50,7 @@ while($user = $q->fetch(PDO::FETCH_ASSOC)) {
                 <form class='admin-useraction'
                       onsubmit=\"adminUpdate(this);  return false;\">
                     <select class='action' name='actions'>");
-                        if (!($userinfo['role'] == 'admin'
+                        if (!($userinfo == 'admin'
                               AND ($user['role'] == 'admin'
                               OR $user['role'] == 'owner'))) {
                             echo "<option value='frozen'>Bevries</option>
diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php
index f1d27a1..a4da648 100644
--- a/website/views/adminpanel.php
+++ b/website/views/adminpanel.php
@@ -5,7 +5,7 @@ $search = "";
 $status = array("user", "frozen", "banned", "unconfirmed", "admin", "owner");
 $groupstatus = array("hidden", "public", "membersonly");
 $pagetype = "user";
-$userinfo = getRoleByID($_SESSION['userID'])->fetch(PDO::FETCH_ASSOC);
+$userinfo = getRoleByID($_SESSION['userID']);
 
 if (isset($_GET["search"])) {
     $search = test_input($_GET["search"]);
@@ -123,7 +123,7 @@ if (isset($_GET["groupstatus"])) {
                     <button type="submit" name="batchactions" id="ban" value="banned">Ban</button>
                     <button type="submit" name="batchactions" id="restore" value="user">Activeer</button>
                     <?php
-                    if ($userinfo['role'] == 'owner') {
+                    if ($userinfo == 'owner') {
                         echo "<button type=\"submit\" 
                                       name=\"batchactions\" 
                                       id=\"admin\"