Fossil SCM

Fix hyperlinks on the [/help?cmd=/winfo|/winfo] page. These were broken when a page was accessed through [/help?cmd=/info|/info/HASH] or <code>/winfo/HASH</code> aliases.

george 2022-02-19 01:59 trunk
Commit 356a4845b3b7f3f360e2f9586c6e9c9fa17404e22f3bf730c419486b45ad900c
Parent 66ef9061183de74…
2 files changed +4 -4 +4 -4
~ src/info.c ~ src/info.c
M src/info.c
+4 -4
--- src/info.c
+++ src/info.c
@@ -986,13 +986,13 @@
986986
 }
987987
 }
988988
 style_header("Update of \"%h\"", pWiki->zWikiTitle);
989989
 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
990990
 zDate = db_text(0, "SELECT datetime(%.17g)", pWiki->rDate);
991
- style_submenu_element("Raw", "artifact/%s", zUuid);
992
- style_submenu_element("History", "whistory?name=%t", pWiki->zWikiTitle);
993
- style_submenu_element("Page", "wiki?name=%t", pWiki->zWikiTitle);
991
+ style_submenu_element("Raw", "%R/artifact/%s", zUuid);
992
+ style_submenu_element("History", "%R/whistory?name=%t", pWiki->zWikiTitle);
993
+ style_submenu_element("Page", "%R/wiki?name=%t", pWiki->zWikiTitle);
994994
 login_anonymous_available();
995995
 @ <div class="section">Overview</div>
996996
 @ <p><table class="label-value">
997997
 @ <tr><th>Artifact&nbsp;ID:</th>
998998
 @ <td>%z(href("%R/artifact/%!S",zUuid))%s(zUuid)</a>
@@ -1014,11 +1014,11 @@
10141014
 if( pWiki->nParent>0 ){
10151015
 int i;
10161016
 @ <tr><th>Parent%s(pWiki->nParent==1?"":"s"):</th><td>
10171017
 for(i=0; i<pWiki->nParent; i++){
10181018
 char *zParent = pWiki->azParent[i];
1019
- @ %z(href("info/%!S",zParent))%s(zParent)</a>
1019
+ @ %z(href("%R/info/%!S",zParent))%s(zParent)</a>
10201020
 @ %z(href("%R/wdiff?id=%!S&pid=%!S",zUuid,zParent))(diff)</a>
10211021
 }
10221022
 @ </td></tr>
10231023
 }
10241024
 tagid = wiki_tagid(pWiki->zWikiTitle);
10251025
--- src/info.c
+++ src/info.c
@@ -986,13 +986,13 @@
986 }
987 }
988 style_header("Update of \"%h\"", pWiki->zWikiTitle);
989 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
990 zDate = db_text(0, "SELECT datetime(%.17g)", pWiki->rDate);
991 style_submenu_element("Raw", "artifact/%s", zUuid);
992 style_submenu_element("History", "whistory?name=%t", pWiki->zWikiTitle);
993 style_submenu_element("Page", "wiki?name=%t", pWiki->zWikiTitle);
994 login_anonymous_available();
995 @ <div class="section">Overview</div>
996 @ <p><table class="label-value">
997 @ <tr><th>Artifact&nbsp;ID:</th>
998 @ <td>%z(href("%R/artifact/%!S",zUuid))%s(zUuid)</a>
@@ -1014,11 +1014,11 @@
1014 if( pWiki->nParent>0 ){
1015 int i;
1016 @ <tr><th>Parent%s(pWiki->nParent==1?"":"s"):</th><td>
1017 for(i=0; i<pWiki->nParent; i++){
1018 char *zParent = pWiki->azParent[i];
1019 @ %z(href("info/%!S",zParent))%s(zParent)</a>
1020 @ %z(href("%R/wdiff?id=%!S&pid=%!S",zUuid,zParent))(diff)</a>
1021 }
1022 @ </td></tr>
1023 }
1024 tagid = wiki_tagid(pWiki->zWikiTitle);
1025
--- src/info.c
+++ src/info.c
@@ -986,13 +986,13 @@
986 }
987 }
988 style_header("Update of \"%h\"", pWiki->zWikiTitle);
989 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
990 zDate = db_text(0, "SELECT datetime(%.17g)", pWiki->rDate);
991 style_submenu_element("Raw", "%R/artifact/%s", zUuid);
992 style_submenu_element("History", "%R/whistory?name=%t", pWiki->zWikiTitle);
993 style_submenu_element("Page", "%R/wiki?name=%t", pWiki->zWikiTitle);
994 login_anonymous_available();
995 @ <div class="section">Overview</div>
996 @ <p><table class="label-value">
997 @ <tr><th>Artifact&nbsp;ID:</th>
998 @ <td>%z(href("%R/artifact/%!S",zUuid))%s(zUuid)</a>
@@ -1014,11 +1014,11 @@
1014 if( pWiki->nParent>0 ){
1015 int i;
1016 @ <tr><th>Parent%s(pWiki->nParent==1?"":"s"):</th><td>
1017 for(i=0; i<pWiki->nParent; i++){
1018 char *zParent = pWiki->azParent[i];
1019 @ %z(href("%R/info/%!S",zParent))%s(zParent)</a>
1020 @ %z(href("%R/wdiff?id=%!S&pid=%!S",zUuid,zParent))(diff)</a>
1021 }
1022 @ </td></tr>
1023 }
1024 tagid = wiki_tagid(pWiki->zWikiTitle);
1025
M src/info.c
+4 -4
--- src/info.c
+++ src/info.c
@@ -986,13 +986,13 @@
986986
 }
987987
 }
988988
 style_header("Update of \"%h\"", pWiki->zWikiTitle);
989989
 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
990990
 zDate = db_text(0, "SELECT datetime(%.17g)", pWiki->rDate);
991
- style_submenu_element("Raw", "artifact/%s", zUuid);
992
- style_submenu_element("History", "whistory?name=%t", pWiki->zWikiTitle);
993
- style_submenu_element("Page", "wiki?name=%t", pWiki->zWikiTitle);
991
+ style_submenu_element("Raw", "%R/artifact/%s", zUuid);
992
+ style_submenu_element("History", "%R/whistory?name=%t", pWiki->zWikiTitle);
993
+ style_submenu_element("Page", "%R/wiki?name=%t", pWiki->zWikiTitle);
994994
 login_anonymous_available();
995995
 @ <div class="section">Overview</div>
996996
 @ <p><table class="label-value">
997997
 @ <tr><th>Artifact&nbsp;ID:</th>
998998
 @ <td>%z(href("%R/artifact/%!S",zUuid))%s(zUuid)</a>
@@ -1014,11 +1014,11 @@
10141014
 if( pWiki->nParent>0 ){
10151015
 int i;
10161016
 @ <tr><th>Parent%s(pWiki->nParent==1?"":"s"):</th><td>
10171017
 for(i=0; i<pWiki->nParent; i++){
10181018
 char *zParent = pWiki->azParent[i];
1019
- @ %z(href("info/%!S",zParent))%s(zParent)</a>
1019
+ @ %z(href("%R/info/%!S",zParent))%s(zParent)</a>
10201020
 @ %z(href("%R/wdiff?id=%!S&pid=%!S",zUuid,zParent))(diff)</a>
10211021
 }
10221022
 @ </td></tr>
10231023
 }
10241024
 tagid = wiki_tagid(pWiki->zWikiTitle);
10251025
--- src/info.c
+++ src/info.c
@@ -986,13 +986,13 @@
986 }
987 }
988 style_header("Update of \"%h\"", pWiki->zWikiTitle);
989 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
990 zDate = db_text(0, "SELECT datetime(%.17g)", pWiki->rDate);
991 style_submenu_element("Raw", "artifact/%s", zUuid);
992 style_submenu_element("History", "whistory?name=%t", pWiki->zWikiTitle);
993 style_submenu_element("Page", "wiki?name=%t", pWiki->zWikiTitle);
994 login_anonymous_available();
995 @ <div class="section">Overview</div>
996 @ <p><table class="label-value">
997 @ <tr><th>Artifact&nbsp;ID:</th>
998 @ <td>%z(href("%R/artifact/%!S",zUuid))%s(zUuid)</a>
@@ -1014,11 +1014,11 @@
1014 if( pWiki->nParent>0 ){
1015 int i;
1016 @ <tr><th>Parent%s(pWiki->nParent==1?"":"s"):</th><td>
1017 for(i=0; i<pWiki->nParent; i++){
1018 char *zParent = pWiki->azParent[i];
1019 @ %z(href("info/%!S",zParent))%s(zParent)</a>
1020 @ %z(href("%R/wdiff?id=%!S&pid=%!S",zUuid,zParent))(diff)</a>
1021 }
1022 @ </td></tr>
1023 }
1024 tagid = wiki_tagid(pWiki->zWikiTitle);
1025
--- src/info.c
+++ src/info.c
@@ -986,13 +986,13 @@
986 }
987 }
988 style_header("Update of \"%h\"", pWiki->zWikiTitle);
989 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
990 zDate = db_text(0, "SELECT datetime(%.17g)", pWiki->rDate);
991 style_submenu_element("Raw", "%R/artifact/%s", zUuid);
992 style_submenu_element("History", "%R/whistory?name=%t", pWiki->zWikiTitle);
993 style_submenu_element("Page", "%R/wiki?name=%t", pWiki->zWikiTitle);
994 login_anonymous_available();
995 @ <div class="section">Overview</div>
996 @ <p><table class="label-value">
997 @ <tr><th>Artifact&nbsp;ID:</th>
998 @ <td>%z(href("%R/artifact/%!S",zUuid))%s(zUuid)</a>
@@ -1014,11 +1014,11 @@
1014 if( pWiki->nParent>0 ){
1015 int i;
1016 @ <tr><th>Parent%s(pWiki->nParent==1?"":"s"):</th><td>
1017 for(i=0; i<pWiki->nParent; i++){
1018 char *zParent = pWiki->azParent[i];
1019 @ %z(href("%R/info/%!S",zParent))%s(zParent)</a>
1020 @ %z(href("%R/wdiff?id=%!S&pid=%!S",zUuid,zParent))(diff)</a>
1021 }
1022 @ </td></tr>
1023 }
1024 tagid = wiki_tagid(pWiki->zWikiTitle);
1025

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button