Fossil SCM
Do not export <var>g.zRelReqURI</var> to TH1 interpreter because <code>getParameter</code> proc can retrieve <code>PATH_INFO</code> and <code>QUERY_STRING</code>. Instead export <var>g.zPath</var> (as <var>$webpagename</var>) since that is typically needed in the TH1 headers/footers of custom skins.
Commit
ff4c7ed6096beceb2cf48055e3c475fd11499bb7dfb06abef3fdf41ca27f8e68
Parent
d97752f30b40a49…
1 file changed
+2
-5
+2
-5
| --- src/style.c | ||
| +++ src/style.c | ||
| @@ -793,16 +793,13 @@ | ||
| 793 | 793 | Th_Store("secureurl", fossil_wants_https(1)? g.zHttpsURL: g.zBaseURL); |
| 794 | 794 | Th_Store("home", g.zTop); |
| 795 | 795 | Th_Store("index_page", db_get("index-page","/home")); |
| 796 | 796 | if( local_zCurrentPage==0 ) style_set_current_page("%T", g.zPath); |
| 797 | 797 | Th_Store("current_page", local_zCurrentPage); |
| 798 | - if( local_zBaseHrefSuffix==0 ){ | |
| 799 | - style_set_base_href_suffix("%s",g.zRelReqURI); | |
| 800 | - /* %s because g.zRelReqURI is already encoded (FIXME: really so?) */ | |
| 801 | - } | |
| 798 | + if( !local_zBaseHrefSuffix ) style_set_base_href_suffix("%s",g.zRelReqURI); | |
| 802 | 799 | Th_Store("base_href_suffix", local_zBaseHrefSuffix); |
| 803 | - Th_Store("relrequri", g.zRelReqURI); | |
| 800 | + Th_Store("webpagename", g.zPath); | |
| 804 | 801 | Th_Store("csrf_token", g.zCsrfToken); |
| 805 | 802 | Th_Store("release_version", RELEASE_VERSION); |
| 806 | 803 | Th_Store("manifest_version", MANIFEST_VERSION); |
| 807 | 804 | Th_Store("manifest_date", MANIFEST_DATE); |
| 808 | 805 | Th_Store("compiler_name", COMPILER_NAME); |
| 809 | 806 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -793,16 +793,13 @@ | |
| 793 | Th_Store("secureurl", fossil_wants_https(1)? g.zHttpsURL: g.zBaseURL); |
| 794 | Th_Store("home", g.zTop); |
| 795 | Th_Store("index_page", db_get("index-page","/home")); |
| 796 | if( local_zCurrentPage==0 ) style_set_current_page("%T", g.zPath); |
| 797 | Th_Store("current_page", local_zCurrentPage); |
| 798 | if( local_zBaseHrefSuffix==0 ){ |
| 799 | style_set_base_href_suffix("%s",g.zRelReqURI); |
| 800 | /* %s because g.zRelReqURI is already encoded (FIXME: really so?) */ |
| 801 | } |
| 802 | Th_Store("base_href_suffix", local_zBaseHrefSuffix); |
| 803 | Th_Store("relrequri", g.zRelReqURI); |
| 804 | Th_Store("csrf_token", g.zCsrfToken); |
| 805 | Th_Store("release_version", RELEASE_VERSION); |
| 806 | Th_Store("manifest_version", MANIFEST_VERSION); |
| 807 | Th_Store("manifest_date", MANIFEST_DATE); |
| 808 | Th_Store("compiler_name", COMPILER_NAME); |
| 809 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -793,16 +793,13 @@ | |
| 793 | Th_Store("secureurl", fossil_wants_https(1)? g.zHttpsURL: g.zBaseURL); |
| 794 | Th_Store("home", g.zTop); |
| 795 | Th_Store("index_page", db_get("index-page","/home")); |
| 796 | if( local_zCurrentPage==0 ) style_set_current_page("%T", g.zPath); |
| 797 | Th_Store("current_page", local_zCurrentPage); |
| 798 | if( !local_zBaseHrefSuffix ) style_set_base_href_suffix("%s",g.zRelReqURI); |
| 799 | Th_Store("base_href_suffix", local_zBaseHrefSuffix); |
| 800 | Th_Store("webpagename", g.zPath); |
| 801 | Th_Store("csrf_token", g.zCsrfToken); |
| 802 | Th_Store("release_version", RELEASE_VERSION); |
| 803 | Th_Store("manifest_version", MANIFEST_VERSION); |
| 804 | Th_Store("manifest_date", MANIFEST_DATE); |
| 805 | Th_Store("compiler_name", COMPILER_NAME); |
| 806 |