From: Art Cancro <ajc@citadel.org>
Date: Thu, 15 Jul 2010 16:59:03 +0000 (+0000)
Subject: * Removed the last instance if is_room_aide
X-Git-Tag: v7.86~96
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=066ed26d61481a84516bde48c2bb06c2159c9fec

* Removed the last instance if is_room_aide
---

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 5b9840cc6..1ab8c8efa 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -845,8 +845,9 @@ void ParseGoto(folder *room, StrBuf *Line)
 	room->is_inbox = StrBufExtractNext_long(Line, &Pos, '|'); // is_mailbox
 
 	flag = StrBufExtractNext_long(Line, &Pos, '|');
-	if (WCC->is_aide || flag)
+	if (WCC->is_aide || flag) {
 		room->RAFlags |= UA_ADMINALLOWED;
+	}
 
 	room->UsersNewMAilboxMessages = StrBufExtractNext_long(Line, &Pos, '|');
 
@@ -2631,10 +2632,11 @@ void entroom(void)
 	serv_getln(buf, sizeof buf);
 	WCC->CurRoom.view = er_view;
 
-	if (WCC->is_aide || WCC->is_room_aide)
+	if ( (WCC != NULL) && ( (WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) )  {
 		display_editroom ();
-	else 
+	} else {
         	do_change_view(er_view);                /* Now go there */
+	}
 
 }