[dw-free] "Invalid journal" error when you have a <form> inside the entry

[kareila]

[commit: http://hg.dwscoalition.org/dw-free/rev/5272e076f648]

http://bugs.dwscoalition.org/show_bug.cgi?id=1652

Rearrange form tags on edittags.bml to avoid colliding with any forms
included in the entry text.

Patch by afuna.

Files modified:

• htdocs/edittags.bml

--------------------------------------------------------------------------------
diff -r d28482a64ca2 -r 5272e076f648 htdocs/edittags.bml
--- a/htdocs/edittags.bml	Mon Oct 05 17:25:03 2009 -0500
+++ b/htdocs/edittags.bml	Mon Oct 05 17:40:30 2009 -0500
@@ -90,9 +90,12 @@ body<=
     $ret .= '<table class="edittbl" cellpadding="0" cellspacing="0" width="50%">';
     $ret .= "<tr><td class='l'>$ML{'.subject'}</td><td>$subj</td></tr>" if $subj;
 
+    $ret .= '<form method="POST" action="/edittags" id="edit_tagform">';
+    $ret .= LJ::html_hidden('journal', $journal);
+    $ret .= LJ::html_hidden('itemid', $GET{itemid} || $POST{itemid});
+    $ret .= LJ::form_auth();
+
     $ret .= "<tr><td class='l'>$ML{'.current'}</td>";
-    $ret .= '<form method="POST" action="/edittags" id="edit_tagform">';
-    $ret .= LJ::form_auth();
     $ret .= "<td class='sep'>";
     if ( LJ::Tags::can_add_tags($u, $remote) ) {
         $ret .= LJ::html_text(
@@ -131,12 +134,11 @@ body<=
     $ret .= "$ML{'.permissions.control.yes'}<br />" if LJ::Tags::can_control_tags($u, $remote);
     $ret .= BML::ml('.view', { aopts => 'href="' . LJ::journal_base($u) . "/$ditemid.html" . '"' });
     $ret .= "</td></tr>";
+    $ret .= '</form>';
+
     $ret .= "<tr><td class='l'>$ML{'.entry'}</td><td class='sep' style='white-space: normal'>$evt</td></tr>";
 
     $ret .= '</table>';
-    $ret .= LJ::html_hidden('journal', $journal);
-    $ret .= LJ::html_hidden('itemid', $GET{itemid} || $POST{itemid});
-    $ret .= '</form>';
 
     return $ret;
 }
--------------------------------------------------------------------------------