Fossil SCM
Fix the broken Delete Post page, caused by now-outdated/removed goings-on in this branch.
Commit
01f6259455d1d62e2e46384e285e370080cc23408a5f285d5ffb9152eea43023
Parent
e9e4c4fabea8c42…
1 file changed
+5
-3
+5
-3
| --- src/forum.c | ||
| +++ src/forum.c | ||
| @@ -2196,11 +2196,11 @@ | ||
| 2196 | 2196 | @ <h1>Original Post:</h1> |
| 2197 | 2197 | forum_render(pPost->zThreadTitle, pPost->zMimetype, pPost->zWiki, |
| 2198 | 2198 | "forumEdit", 1); |
| 2199 | 2199 | @ <h1>Change Into:</h1> |
| 2200 | 2200 | forum_render(zTitle, zMimetype, zContent,"forumEdit", 1); |
| 2201 | - @ <form action="%R/forume2" method="POST" class="remove-on-load"> | |
| 2201 | + @ <form action="%R/forume2" method="POST"> | |
| 2202 | 2202 | login_insert_csrf_secret(); |
| 2203 | 2203 | @ <input type="hidden" name="fpid" value="%h(P("fpid"))"> |
| 2204 | 2204 | @ <input type="hidden" name="nullout" value="1"> |
| 2205 | 2205 | @ <input type="hidden" name="mimetype" value="%h(zMimetype)"> |
| 2206 | 2206 | @ <input type="hidden" name="content" value="%h(zContent)"> |
| @@ -2224,11 +2224,11 @@ | ||
| 2224 | 2224 | if( bPreview ){ |
| 2225 | 2225 | @ <h2>Preview of Edited Post:</h2> |
| 2226 | 2226 | forum_render(zTitle, zMimetype, zContent,"forumEdit", 1); |
| 2227 | 2227 | } |
| 2228 | 2228 | @ <h2>Revised Message:</h2> |
| 2229 | - @ <form action="%R/forume2" method="POST" class="remove-on-load"> | |
| 2229 | + @ <form action="%R/forume2" method="POST"> | |
| 2230 | 2230 | login_insert_csrf_secret(); |
| 2231 | 2231 | @ <input type="hidden" name="fpid" value="%h(P("fpid"))"> |
| 2232 | 2232 | @ <input type="hidden" name="edit" value="1"> |
| 2233 | 2233 | forum_from_line(); |
| 2234 | 2234 | forum_post_widget(zTitle, zMimetype, zContent); |
| @@ -2276,11 +2276,13 @@ | ||
| 2276 | 2276 | login_insert_csrf_secret(); |
| 2277 | 2277 | @ </form> |
| 2278 | 2278 | if( !bReply ){ |
| 2279 | 2279 | forum_render_attachment_list(rid_to_uuid(fpid)); |
| 2280 | 2280 | } |
| 2281 | - forum_render_attachment_notice(); | |
| 2281 | + if( !isDelete ){ | |
| 2282 | + forum_render_attachment_notice(); | |
| 2283 | + } | |
| 2282 | 2284 | forum_emit_js(); |
| 2283 | 2285 | style_finish_page(); |
| 2284 | 2286 | } |
| 2285 | 2287 | |
| 2286 | 2288 | /* |
| 2287 | 2289 |
| --- src/forum.c | |
| +++ src/forum.c | |
| @@ -2196,11 +2196,11 @@ | |
| 2196 | @ <h1>Original Post:</h1> |
| 2197 | forum_render(pPost->zThreadTitle, pPost->zMimetype, pPost->zWiki, |
| 2198 | "forumEdit", 1); |
| 2199 | @ <h1>Change Into:</h1> |
| 2200 | forum_render(zTitle, zMimetype, zContent,"forumEdit", 1); |
| 2201 | @ <form action="%R/forume2" method="POST" class="remove-on-load"> |
| 2202 | login_insert_csrf_secret(); |
| 2203 | @ <input type="hidden" name="fpid" value="%h(P("fpid"))"> |
| 2204 | @ <input type="hidden" name="nullout" value="1"> |
| 2205 | @ <input type="hidden" name="mimetype" value="%h(zMimetype)"> |
| 2206 | @ <input type="hidden" name="content" value="%h(zContent)"> |
| @@ -2224,11 +2224,11 @@ | |
| 2224 | if( bPreview ){ |
| 2225 | @ <h2>Preview of Edited Post:</h2> |
| 2226 | forum_render(zTitle, zMimetype, zContent,"forumEdit", 1); |
| 2227 | } |
| 2228 | @ <h2>Revised Message:</h2> |
| 2229 | @ <form action="%R/forume2" method="POST" class="remove-on-load"> |
| 2230 | login_insert_csrf_secret(); |
| 2231 | @ <input type="hidden" name="fpid" value="%h(P("fpid"))"> |
| 2232 | @ <input type="hidden" name="edit" value="1"> |
| 2233 | forum_from_line(); |
| 2234 | forum_post_widget(zTitle, zMimetype, zContent); |
| @@ -2276,11 +2276,13 @@ | |
| 2276 | login_insert_csrf_secret(); |
| 2277 | @ </form> |
| 2278 | if( !bReply ){ |
| 2279 | forum_render_attachment_list(rid_to_uuid(fpid)); |
| 2280 | } |
| 2281 | forum_render_attachment_notice(); |
| 2282 | forum_emit_js(); |
| 2283 | style_finish_page(); |
| 2284 | } |
| 2285 | |
| 2286 | /* |
| 2287 |
| --- src/forum.c | |
| +++ src/forum.c | |
| @@ -2196,11 +2196,11 @@ | |
| 2196 | @ <h1>Original Post:</h1> |
| 2197 | forum_render(pPost->zThreadTitle, pPost->zMimetype, pPost->zWiki, |
| 2198 | "forumEdit", 1); |
| 2199 | @ <h1>Change Into:</h1> |
| 2200 | forum_render(zTitle, zMimetype, zContent,"forumEdit", 1); |
| 2201 | @ <form action="%R/forume2" method="POST"> |
| 2202 | login_insert_csrf_secret(); |
| 2203 | @ <input type="hidden" name="fpid" value="%h(P("fpid"))"> |
| 2204 | @ <input type="hidden" name="nullout" value="1"> |
| 2205 | @ <input type="hidden" name="mimetype" value="%h(zMimetype)"> |
| 2206 | @ <input type="hidden" name="content" value="%h(zContent)"> |
| @@ -2224,11 +2224,11 @@ | |
| 2224 | if( bPreview ){ |
| 2225 | @ <h2>Preview of Edited Post:</h2> |
| 2226 | forum_render(zTitle, zMimetype, zContent,"forumEdit", 1); |
| 2227 | } |
| 2228 | @ <h2>Revised Message:</h2> |
| 2229 | @ <form action="%R/forume2" method="POST"> |
| 2230 | login_insert_csrf_secret(); |
| 2231 | @ <input type="hidden" name="fpid" value="%h(P("fpid"))"> |
| 2232 | @ <input type="hidden" name="edit" value="1"> |
| 2233 | forum_from_line(); |
| 2234 | forum_post_widget(zTitle, zMimetype, zContent); |
| @@ -2276,11 +2276,13 @@ | |
| 2276 | login_insert_csrf_secret(); |
| 2277 | @ </form> |
| 2278 | if( !bReply ){ |
| 2279 | forum_render_attachment_list(rid_to_uuid(fpid)); |
| 2280 | } |
| 2281 | if( !isDelete ){ |
| 2282 | forum_render_attachment_notice(); |
| 2283 | } |
| 2284 | forum_emit_js(); |
| 2285 | style_finish_page(); |
| 2286 | } |
| 2287 | |
| 2288 | /* |
| 2289 |