kareila: (Default)
kareila ([personal profile] kareila) wrote in [site community profile] changelog2010-04-19 04:06 pm

[dw-free] "BML block 'P' has no close" error on several pages when using uselang=debug

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

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

Add spaces when constructing BML paragraphs to avoid rendering errors.

Patch by [personal profile] ninetydegrees.

Files modified:
  • htdocs/editprivacy.bml
  • htdocs/edittags.bml
  • htdocs/interests.bml
  • htdocs/manage/emailpost.bml
  • htdocs/tools/memadd.bml
--------------------------------------------------------------------------------
diff -r 4875a1fd6eb9 -r c33b18fe21de htdocs/editprivacy.bml
--- a/htdocs/editprivacy.bml	Mon Apr 19 10:50:02 2010 -0500
+++ b/htdocs/editprivacy.bml	Mon Apr 19 11:06:25 2010 -0500
@@ -92,7 +92,7 @@ body<=
         $ret .= "<?p " . BML::ml('.archive',
                                 { aopts => "href='" . $u->journal_base() . "/archive/'" })
                 . " p?>\n";;
-        $ret .= "<?p " . BML::ml( 'xpost.respected', { aopts => "href='$LJ::SITEROOT/manage/settings/?cat=othersites'" } ) . "p?>";
+        $ret .= "<?p " . BML::ml( 'xpost.respected', { aopts => "href='$LJ::SITEROOT/manage/settings/?cat=othersites'" } ) . " p?>";
 
         $ret .= "<form method='post' action='./editprivacy'>";
         $ret .= "<?h1 $ML{'.timeframe'} h1?>";
diff -r 4875a1fd6eb9 -r c33b18fe21de htdocs/edittags.bml
--- a/htdocs/edittags.bml	Mon Apr 19 10:50:02 2010 -0500
+++ b/htdocs/edittags.bml	Mon Apr 19 11:06:25 2010 -0500
@@ -102,7 +102,7 @@ body<=
     my $logtagstr = join ', ', map { LJ::ejs($_) } sort values %$logtags;
 
     $ret .= "<?p $ML{'.intro'} p?>";
-    $ret .= "<?p " . BML::ml( 'xpost.notrespected', { aopts => "href='$LJ::SITEROOT/manage/settings/?cat=othersites'" } ) . " " . BML::ml( '.xpost.notrespected.editentry', { aopts => "href='$LJ::SITEROOT/editjournal?journal=$journal&amp;itemid=$ditemid'" } ) . "p?><br />";
+    $ret .= "<?p " . BML::ml( 'xpost.notrespected', { aopts => "href='$LJ::SITEROOT/manage/settings/?cat=othersites'" } ) . " " . BML::ml( '.xpost.notrespected.editentry', { aopts => "href='$LJ::SITEROOT/editjournal?journal=$journal&amp;itemid=$ditemid'" } ) . " p?><br />";
 
     $ret .= "<script type='text/javascript'> var cur_taglist = '$logtagstr'; </script>";
 
diff -r 4875a1fd6eb9 -r c33b18fe21de htdocs/interests.bml
--- a/htdocs/interests.bml	Mon Apr 19 10:50:02 2010 -0500
+++ b/htdocs/interests.bml	Mon Apr 19 11:06:25 2010 -0500
@@ -412,7 +412,7 @@ body<=
             $ret .= BML::ml( '.nocomms.text', { 'int' => $e_int, 'aopts' => qq(href="$LJ::SITEROOT/community/create") } );
             $ret .= " p?><?h1 $ML{'.nousers.header'} h1?><?p ";
             $ret .= BML::ml( '.nousers.text', { 'int' => $e_int, 'aopts_manage' => "href='$LJ::SITEROOT/manage/profile/'", 'aopts_int' => "href='$LJ::SITEROOT/interests'" } );
-            $ret .= "p?>";
+            $ret .= " p?>";
             return $ret;
         } 
 
diff -r 4875a1fd6eb9 -r c33b18fe21de htdocs/manage/emailpost.bml
--- a/htdocs/manage/emailpost.bml	Mon Apr 19 10:50:02 2010 -0500
+++ b/htdocs/manage/emailpost.bml	Mon Apr 19 11:06:25 2010 -0500
@@ -99,7 +99,7 @@ body<=
 
         if ($need_login) {
             $ret .= "<?h1 $ML{'.error.notloggedin.header'} h1?>";
-            $ret .= "<?p " . LJ::error_noremote() . "p?>";
+            $ret .= "<?p " . LJ::error_noremote() . " p?>";
         }
 
         my @topics = (
diff -r 4875a1fd6eb9 -r c33b18fe21de htdocs/tools/memadd.bml
--- a/htdocs/tools/memadd.bml	Mon Apr 19 10:50:02 2010 -0500
+++ b/htdocs/tools/memadd.bml	Mon Apr 19 11:06:25 2010 -0500
@@ -115,7 +115,7 @@ _c?>
                 $title = $ML{'.title.deleted'};
                 $body = "<?h1 $ML{'.error.deleted.title'} h1?><?p " .
                         BML::ml(".error.deleted.body", { 'desc' => $memory->{'des'} }) .
-                        "p?>";
+                        " p?>";
                 return;
             } else {
                 $title = $ML{'Error'};
@@ -340,7 +340,7 @@ _c?>
             if (length($kw) > 40) {
                 $title = $ML{'Error'};
                 $body = "<?h1 $ML{'Error'} h1?><?p " .
-                        BML::ml(".error.maxsize", { 'keyword' => LJ::ehtml($kw) }) . "p?>";
+                        BML::ml(".error.maxsize", { 'keyword' => LJ::ehtml($kw) }) . " p?>";
                 return;
             }
 
--------------------------------------------------------------------------------