fix encode-wiki-q function.

diff --git a/cgi/main.cc b/cgi/main.cc
index b910122..1d60d09 100644 (file)
--- a/cgi/main.cc
+++ b/cgi/main.cc
@@ -194,7 +194,6 @@ int  main (int argc, char** argv) {
        form = new CGIFormUTF8JPMS;
        out = new MotorOutputCOutJPMS;
     } else {
-//     form = new CGIFormUTF8;
        form = new CGIFormUTF8JPMS;
        out = new MotorOutputCOut;
     }
@@ -207,9 +206,9 @@ int  main (int argc, char** argv) {
     try {
        ustring  ext;
 
-//     aenv.readOption (argc, argv, &env);
        scriptfilename = glue1 ();
        if (! isPlainFile (scriptfilename) || isExecutableFile (scriptfilename)) {
+//     if (! isPlainFile (scriptfilename)) {
            env.forbiddenResponse ();
            goto Ex1;
        }

diff --git a/modules/ml-encode.cc b/modules/ml-encode.cc
index d0a9c80..686c0e8 100644 (file)
--- a/modules/ml-encode.cc
+++ b/modules/ml-encode.cc
@@ -113,7 +113,7 @@ MNode*  ml_escape_wiki_q (MNode* cell, MlEnv* mlenv) {
     ustring  ans;
     uiterator  b, e;
     umatch  m;
-    static uregex  re ("([\\[&|:])|(<br>)|('')|(\n)");
+    static uregex  re ("([\\[\\]&|:])|(<br>)|('')|(\n)");
 
     ans.append (CharConst ("[[q:"));
     while (arg) {