Reverts commit c6aec42f213ec284e34648f3d69bcf927dccddb1 because putting the opening...

[citadel.git] / webcit / roomops.c

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 3aa28ea91e4fbd73be78761a7e4c293f48e08633..be4c628da140f31453327beb6f3d20f0e55fd88f 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -1,7 +1,7 @@
 /*
  * Lots of different room-related operations.
  *
- * Copyright (c) 1996-2012 by the citadel.org team
+ * Copyright (c) 1996-2016 by the citadel.org team
  *
  * This program is open source software.  You can redistribute it and/or
  * modify it under the terms of the GNU General Public License, version 3.
@@ -113,13 +113,11 @@ void dotskip(void) {
 }
 
 void dotgoto(void) {
-       wcsession *WCC = WC;
        if (!havebstr("room")) {
                readloop(readnew, eUseDefault);
                return;
        }
-       if ((WCC->CurRoom.view != VIEW_MAILBOX)  &&
-           (WCC->CurRoom.view != WCC->CurRoom.view)) {
+       if (WC->CurRoom.view != VIEW_MAILBOX) {
                /* dotgoto acts like dotskip when we're in a mailbox view */
                slrp_highest();
        }
@@ -1529,7 +1527,6 @@ InitModule_ROOMOPS
        REGISTERTokenParamDefine(VIEW_JOURNAL);
        REGISTERTokenParamDefine(VIEW_BLOG);
        REGISTERTokenParamDefine(VIEW_QUEUE);
-       REGISTERTokenParamDefine(VIEW_WIKIMD);          
 
        /* GNET types: */
        /* server internal, we need to know but ignore them. */