From: visor <visor@users.sourceforge.jp>
Date: Wed, 13 Jan 2010 12:21:18 +0000 (+0900)
Subject: fix encode-wiki-q function.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ba5026daedf6adcf7f13949d49447eb4eb1f210f;p=hmh%2Fhhml.git

fix encode-wiki-q function.
---

diff --git a/cgi/main.cc b/cgi/main.cc
index b910122..1d60d09 100644
--- 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
--- 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) {