Fossil SCM

Fix the URL on some Download submenu links.

drh 2020-05-21 13:00 trunk
Commit 9d18585d544b41f27dcce9b5e531fe586e0b2a1fb44a8b3da41f19988691790f
Parent a8098efebfa81f2…
1 file changed +4 -6
~ src/info.c
M src/info.c
+4 -6
--- src/info.c
+++ src/info.c
@@ -1929,12 +1929,11 @@
19291929
 @ :</h2>
19301930
 }
19311931
 blob_zero(&downloadName);
19321932
 if( P("verbose")!=0 ) objdescFlags |= OBJDESC_DETAIL;
19331933
 object_description(rid, objdescFlags, 0, &downloadName);
1934
- style_submenu_element("Download", "%s/raw/%T?name=%s",
1935
- g.zTop, blob_str(&downloadName), zUuid);
1934
+ style_submenu_element("Download", "%R/raw/%s", zUuid);
19361935
 @ <hr />
19371936
 content_get(rid, &content);
19381937
 @ <blockquote><pre>
19391938
 hexdump(&content);
19401939
 @ </pre></blockquote>
@@ -2259,11 +2258,11 @@
22592258
 if( asText ) objdescFlags &= ~OBJDESC_BASE;
22602259
 objType = object_description(rid, objdescFlags,
22612260
 (isFile?zName:0), &downloadName);
22622261
 }
22632262
 if( !descOnly && P("download")!=0 ){
2264
- cgi_redirectf("%R/raw/%T?name=%s", blob_str(&downloadName),
2263
+ cgi_redirectf("%R/raw/%s",
22652264
 db_text("?", "SELECT uuid FROM blob WHERE rid=%d", rid));
22662265
 /*NOTREACHED*/
22672266
 }
22682267
 if( g.perm.Admin ){
22692268
 const char *zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
@@ -2305,12 +2304,11 @@
23052304
 const char *zIp = db_column_text(&q,2);
23062305
 @ <p>Received on %s(zDate) from %h(zUser) at %h(zIp).</p>
23072306
 }
23082307
 db_finalize(&q);
23092308
 }
2310
- style_submenu_element("Download", "%R/raw/%T?name=%s",
2311
- blob_str(&downloadName), zUuid);
2309
+ style_submenu_element("Download", "%R/raw/%s", zUuid);
23122310
 if( db_exists("SELECT 1 FROM mlink WHERE fid=%d", rid) ){
23132311
 style_submenu_element("Check-ins Using", "%R/timeline?n=200&uf=%s", zUuid);
23142312
 }
23152313
 zMime = mimetype_from_name(blob_str(&downloadName));
23162314
 if( zMime ){
@@ -2340,11 +2338,11 @@
23402338
 @ <hr />
23412339
 content_get(rid, &content);
23422340
 if( renderAsWiki ){
23432341
 wiki_render_by_mimetype(&content, zMime);
23442342
 }else if( renderAsHtml ){
2345
- @ <iframe src="%R/raw/%T(blob_str(&downloadName))?name=%s(zUuid)"
2343
+ @ <iframe src="%R/raw/%s(zUuid)"
23462344
 @ width="100%%" frameborder="0" marginwidth="0" marginheight="0"
23472345
 @ sandbox="allow-same-origin" id="ifm1">
23482346
 @ </iframe>
23492347
 @ <script nonce="%h(style_nonce())">
23502348
 @ document.getElementById("ifm1").addEventListener("load",
23512349
--- src/info.c
+++ src/info.c
@@ -1929,12 +1929,11 @@
1929 @ :</h2>
1930 }
1931 blob_zero(&downloadName);
1932 if( P("verbose")!=0 ) objdescFlags |= OBJDESC_DETAIL;
1933 object_description(rid, objdescFlags, 0, &downloadName);
1934 style_submenu_element("Download", "%s/raw/%T?name=%s",
1935 g.zTop, blob_str(&downloadName), zUuid);
1936 @ <hr />
1937 content_get(rid, &content);
1938 @ <blockquote><pre>
1939 hexdump(&content);
1940 @ </pre></blockquote>
@@ -2259,11 +2258,11 @@
2259 if( asText ) objdescFlags &= ~OBJDESC_BASE;
2260 objType = object_description(rid, objdescFlags,
2261 (isFile?zName:0), &downloadName);
2262 }
2263 if( !descOnly && P("download")!=0 ){
2264 cgi_redirectf("%R/raw/%T?name=%s", blob_str(&downloadName),
2265 db_text("?", "SELECT uuid FROM blob WHERE rid=%d", rid));
2266 /*NOTREACHED*/
2267 }
2268 if( g.perm.Admin ){
2269 const char *zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
@@ -2305,12 +2304,11 @@
2305 const char *zIp = db_column_text(&q,2);
2306 @ <p>Received on %s(zDate) from %h(zUser) at %h(zIp).</p>
2307 }
2308 db_finalize(&q);
2309 }
2310 style_submenu_element("Download", "%R/raw/%T?name=%s",
2311 blob_str(&downloadName), zUuid);
2312 if( db_exists("SELECT 1 FROM mlink WHERE fid=%d", rid) ){
2313 style_submenu_element("Check-ins Using", "%R/timeline?n=200&uf=%s", zUuid);
2314 }
2315 zMime = mimetype_from_name(blob_str(&downloadName));
2316 if( zMime ){
@@ -2340,11 +2338,11 @@
2340 @ <hr />
2341 content_get(rid, &content);
2342 if( renderAsWiki ){
2343 wiki_render_by_mimetype(&content, zMime);
2344 }else if( renderAsHtml ){
2345 @ <iframe src="%R/raw/%T(blob_str(&downloadName))?name=%s(zUuid)"
2346 @ width="100%%" frameborder="0" marginwidth="0" marginheight="0"
2347 @ sandbox="allow-same-origin" id="ifm1">
2348 @ </iframe>
2349 @ <script nonce="%h(style_nonce())">
2350 @ document.getElementById("ifm1").addEventListener("load",
2351
--- src/info.c
+++ src/info.c
@@ -1929,12 +1929,11 @@
1929 @ :</h2>
1930 }
1931 blob_zero(&downloadName);
1932 if( P("verbose")!=0 ) objdescFlags |= OBJDESC_DETAIL;
1933 object_description(rid, objdescFlags, 0, &downloadName);
1934 style_submenu_element("Download", "%R/raw/%s", zUuid);
 
1935 @ <hr />
1936 content_get(rid, &content);
1937 @ <blockquote><pre>
1938 hexdump(&content);
1939 @ </pre></blockquote>
@@ -2259,11 +2258,11 @@
2258 if( asText ) objdescFlags &= ~OBJDESC_BASE;
2259 objType = object_description(rid, objdescFlags,
2260 (isFile?zName:0), &downloadName);
2261 }
2262 if( !descOnly && P("download")!=0 ){
2263 cgi_redirectf("%R/raw/%s",
2264 db_text("?", "SELECT uuid FROM blob WHERE rid=%d", rid));
2265 /*NOTREACHED*/
2266 }
2267 if( g.perm.Admin ){
2268 const char *zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
@@ -2305,12 +2304,11 @@
2304 const char *zIp = db_column_text(&q,2);
2305 @ <p>Received on %s(zDate) from %h(zUser) at %h(zIp).</p>
2306 }
2307 db_finalize(&q);
2308 }
2309 style_submenu_element("Download", "%R/raw/%s", zUuid);
 
2310 if( db_exists("SELECT 1 FROM mlink WHERE fid=%d", rid) ){
2311 style_submenu_element("Check-ins Using", "%R/timeline?n=200&uf=%s", zUuid);
2312 }
2313 zMime = mimetype_from_name(blob_str(&downloadName));
2314 if( zMime ){
@@ -2340,11 +2338,11 @@
2338 @ <hr />
2339 content_get(rid, &content);
2340 if( renderAsWiki ){
2341 wiki_render_by_mimetype(&content, zMime);
2342 }else if( renderAsHtml ){
2343 @ <iframe src="%R/raw/%s(zUuid)"
2344 @ width="100%%" frameborder="0" marginwidth="0" marginheight="0"
2345 @ sandbox="allow-same-origin" id="ifm1">
2346 @ </iframe>
2347 @ <script nonce="%h(style_nonce())">
2348 @ document.getElementById("ifm1").addEventListener("load",
2349

Keyboard Shortcuts

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