SHA1 Hash:	dec4685720199ad6eb20f4824d8ae9452be10aa4
Date:	2009-09-15 00:58:58
User:	drh
Comment:	Fix over-quoting of wiki names. Ticket e4a31ae35cd521b
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified src/wiki.c from [4e98ad4b0c] to [64f66c970f].

@@ -119,11 +119,10 @@
   int rid = 0;
   int isSandbox;
   Blob wiki;
   Manifest m;
   const char *zPageName;
-  char *zHtmlPageName;
   char *zBody = mprintf("%s","<i>Empty Page</i>");
 
   login_check_credentials();
   if( !g.okRdWiki ){ login_needed(); return; }
   zPageName = P("name");
@@ -130,12 +129,12 @@
   if( zPageName==0 ){
     style_header("Wiki");
     @ <ul>
     { char *zHomePageName = db_get("project-name",0);
       if( zHomePageName ){
-        @ <li> <a href="%s(g.zBaseURL)/wiki?name=%s(zHomePageName)">
-        @      %s(zHomePageName)</a> wiki home page.</li>
+        @ <li> <a href="%s(g.zBaseURL)/wiki?name=%t(zHomePageName)">
+        @      %h(zHomePageName)</a> wiki home page.</li>
       }
     }
     @ <li> <a href="%s(g.zBaseURL)/timeline?y=w">Recent changes</a> to wiki
     @      pages. </li>
     @ <li> <a href="%s(g.zBaseURL)/wiki_rules">Formatting rules</a> for
@@ -183,12 +182,11 @@
     if( g.okHistory ){
       style_submenu_element("History", "History", "%s/whistory?name=%T",
            g.zTop, zPageName);
     }
   }
-  zHtmlPageName = mprintf("%h", zPageName);
-  style_header(zHtmlPageName);
+  style_header(zPageName);
   blob_init(&wiki, zBody, -1);
   wiki_convert(&wiki, 0, 0);
   blob_reset(&wiki);
   if( !isSandbox ){
     manifest_clear(&m);
@@ -291,11 +289,11 @@
     return;
   }
   if( zBody==0 ){
     zBody = mprintf("<i>Empty Page</i>");
   }
-  zHtmlPageName = mprintf("Edit: %h", zPageName);
+  zHtmlPageName = mprintf("Edit: %s", zPageName);
   style_header(zHtmlPageName);
   if( P("preview")!=0 ){
     blob_zero(&wiki);
     blob_append(&wiki, zBody, -1);
     @ Preview:<hr>
@@ -486,11 +484,11 @@
   char *zSQL;
   const char *zPageName;
   login_check_credentials();
   if( !g.okHistory ){ login_needed(); return; }
   zPageName = PD("name","");
-  zTitle = mprintf("History Of %h", zPageName);
+  zTitle = mprintf("History Of %s", zPageName);
   style_header(zTitle);
   free(zTitle);
 
   zSQL = mprintf("%s AND event.objid IN "
                  "  (SELECT rid FROM tagxref WHERE tagid="
@@ -523,17 +521,17 @@
   rid1 = atoi(PD("a","0"));
   if( !g.okHistory ){ login_needed(); return; }
   if( rid1==0 ) fossil_redirect_home();
   rid2 = atoi(PD("b","0"));
   zPageName = PD("name","");
-  zTitle = mprintf("Changes To %h", zPageName);
+  zTitle = mprintf("Changes To %s", zPageName);
   style_header(zTitle);
   free(zTitle);
 
   if( rid2==0 ){
     rid2 = db_int(0,
-      "SELECT objid FROM event JOIN tagxref ON objid=rid AND tagid="
+      "SELECT objid FROM event JOIN tagxref ON objid=rid AND tagxref.tagid="
                         "(SELECT tagid FROM tag WHERE tagname='wiki-%q')"
       " WHERE event.mtime<(SELECT mtime FROM event WHERE objid=%d)"
       " ORDER BY event.mtime DESC LIMIT 1",
       zPageName, rid1
     );