Internal version number is now 6.80

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 90a4ef70daa49ce9861897dfcdb41b521f9344fe..31371415055c1ce94a878d86d1bff28025495e88 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -33,7 +33,7 @@ extern "C" {
 /*
  * Text description of this software
  */
-#define CITADEL        "Citadel 6.73"
+#define CITADEL        "Citadel 6.80"
 
 /*
  * REV_LEVEL is the current version number (multiplied by 100 to avoid having
@@ -45,7 +45,7 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL      673             /* This version */
+#define REV_LEVEL      680             /* This version */
 #define REV_MIN                591             /* Oldest compatible database */
 #define EXPORT_REV_MIN 655             /* Oldest compatible export files */
 

diff --git a/citadel/citadel.nsi b/citadel/citadel.nsi
index d44c64319a05c9876afb39e4f265b3a4770c36db..32607b6c14e92c3f2a787e4957ae369efcf8e684 100644 (file)
--- a/citadel/citadel.nsi
+++ b/citadel/citadel.nsi
@@ -4,7 +4,7 @@
 
 !include "${NSISDIR}\Contrib\Modern UI\System.nsh"
 !define MUI_PRODUCT "Citadel"
-!define MUI_VERSION "6.70"
+!define MUI_VERSION "6.80"
 !define MUI_WELCOMEPAGE
 !define MUI_LICENSEPAGE
 !define MUI_COMPONENTSPAGE
@@ -18,7 +18,7 @@
 ;!define MUI_ICON "${NSISDIR}\Contrib\Icons\modern-install.ico"
 ;!define MUI_UNICON "${NSISDIR}\Contrib\Icons\modern-uninstall.ico"
 
-OutFile "citadel-6.70.exe"
+OutFile "citadel-6.80.exe"
 BGGradient off
 
 LangString DESC_Citadel ${LANG_ENGLISH} "Citadel client and core libraries (required)"

diff --git a/citadel/citadel.spec b/citadel/citadel.spec
index 8616ffc7d779d444d91c3a5fd0394fd7ca8bb8bd..42b8a539f515b93dc885108810d68ead816a4c1e 100644 (file)
--- a/citadel/citadel.spec
+++ b/citadel/citadel.spec
@@ -1,7 +1,7 @@
 # $Id$
 Summary: Citadel, the flexible, powerful way to build online communities
 Name: citadel
-Version: 6.70
+Version: 6.80
 Release: 1
 Copyright: GPL
 Group: Applications/Communications

diff --git a/citadel/serv_fulltext.c b/citadel/serv_fulltext.c
index 3b65c8a259c9b60f9652c412a9f754ad75e2c7c1..2c23d49dc09b30387fe1e7785d2f9a6dd0396778 100644 (file)
--- a/citadel/serv_fulltext.c
+++ b/citadel/serv_fulltext.c
@@ -422,7 +422,7 @@ void ft_search(int *fts_num_msgs, long **fts_msgs, char *search_string) {
 
 
 /*
- * Tentative form of a search command
+ * This search command is for diagnostic purposes and may be removed or replaced.
  */
 void cmd_srch(char *argbuf) {
        int num_msgs = 0;
@@ -435,6 +435,7 @@ void cmd_srch(char *argbuf) {
        if (!config.c_enable_fulltext) {
                cprintf("%d Full text index is not enabled on this server.\n",
                        ERROR + CMD_NOT_SUPPORTED);
+               return;
        }
 
        extract_token(search_string, argbuf, 0, '|', sizeof search_string);