[livejournal] r18866: LJSUP-8567 (talkread.bml crashed: Can't ...

U   trunk/htdocs/talkread.bml

Modified: trunk/htdocs/talkread.bml
===================================================================
--- trunk/htdocs/talkread.bml	2011-04-13 06:30:51 UTC (rev 18865)
+++ trunk/htdocs/talkread.bml	2011-04-13 07:11:38 UTC (rev 18866)
@@ -101,9 +101,19 @@
     $$head .= $LJ::SHARE_THIS_URL_GEN->(journal => $u->username)
        unless $LJ::DISABLED{'sharethis'};
 
+    unless ($item && $item->{'anum'} == $init->{'anum'}) {
+        LJ::Request->pnotes ('error' => 'e404');
+        LJ::Request->pnotes ('remote' => LJ::get_remote());
+        BML::return_error_status(404);
+        return;
+    }
+
     my %meta = (
-        'title'       => LJ::Text->drop_html($entry->subject_raw),
-        'description' => LJ::Text->drop_html($entry->event_raw),
+        'title'
+            => LJ::ehtml( LJ::Text->drop_html( $entry->subject_raw ) ),
+
+        'description'
+            => LJ::ehtml( LJ::Text->drop_html( $entry->event_raw ) ),
     );
 
     $$head .= qq[
@@ -111,13 +121,6 @@
         <meta name="description" value="$meta{'description'}"/>
     ];
 
-    unless ($item && $item->{'anum'} == $init->{'anum'}) {
-        LJ::Request->pnotes ('error' => 'e404');
-        LJ::Request->pnotes ('remote' => LJ::get_remote());
-        BML::return_error_status(404);
-        return;
-    }
-
     my $talkurl = LJ::journal_base($u) . "/$ditemid.html";
 
     ### load users