Accidentally merged the configdb branch into master. Reverting.

[citadel.git] / citadel / modules / ctdlproto / serv_messages.c

diff --git a/citadel/modules/ctdlproto/serv_messages.c b/citadel/modules/ctdlproto/serv_messages.c
index 3a51e16b6b46ea86319f6b841b05a61ef1a7e698..2d3208a221640a8c16f6ae0ce755e27de8c791df 100644 (file)
--- a/citadel/modules/ctdlproto/serv_messages.c
+++ b/citadel/modules/ctdlproto/serv_messages.c
@@ -1,7 +1,7 @@
 /*
  * represent messages to the citadel clients
  *
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2012 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.
@@ -20,11 +20,11 @@
 #include "internet_addressing.h"
 #include "user_ops.h"
 #include "room_ops.h"
-#include "config.h"
 
 extern char *msgkeys[];
 
 
+
 /*
  * Back end for the MSGS command: output message number only.
  */
@@ -34,6 +34,7 @@ void simple_listing(long msgnum, void *userdata)
 }
 
 
+
 /*
  * Back end for the MSGS command: output header summary.
  */
@@ -136,7 +137,7 @@ void cmd_msgs(char *cmdbuf)
        else
                mode = MSGS_ALL;
 
-       if ( (mode == MSGS_SEARCH) && (!CtdlGetConfigInt("c_enable_fulltext")) ) {
+       if ( (mode == MSGS_SEARCH) && (!config.c_enable_fulltext) ) {
                cprintf("%d Full text index is not enabled on this server.\n",
                        ERROR + CMD_NOT_SUPPORTED);
                return;