[livejournal] r19405: LJSUP-9193: Uninitialized variable using...

U   trunk/cgi-bin/LJ/S2/HeadContent.pm

Modified: trunk/cgi-bin/LJ/S2/HeadContent.pm
===================================================================
--- trunk/cgi-bin/LJ/S2/HeadContent.pm	2011-06-30 09:00:30 UTC (rev 19404)
+++ trunk/cgi-bin/LJ/S2/HeadContent.pm	2011-06-30 09:00:52 UTC (rev 19405)
@@ -135,28 +135,9 @@
     if ( $need_block_robots || $self->{type} eq 'FriendsPage' ) {
         $head_content .= LJ::robot_meta_tags();
     }
-
-    if ( $opts->{dont_show_nav_strip} ) {
-        $head_content .= _get_html_dont_show_navstrip();
-    }
     return $head_content;
 }
 
-sub _get_html_dont_show_navstrip {
-
-    return qq{<style type="text/css">
-                html body {
-                    padding-top: 0 !important;
-                }
-                #lj_controlstrip,
-                .w-cs,
-                .b-message-mobile,
-                .appwidget-sitemessages {
-                    display: none !important;
-                }
-            </style>};
-}
-
 sub _entry_page_head {
     my ($self) = @_;
 
@@ -164,10 +145,8 @@
     my $remote = $self->{remote};
     my $opts = $self->{opts} || {};
 
-    my $head_content = '';
+    my $head_content = $opts->{entry_cmtinfo} || '';
 
-    $head_content .= $opts->{entry_cmtinfo};
-
     if ( $opts->{entry_metadata} ) {
         my %meta = %{ $opts->{entry_metadata} };
         $head_content .= qq(<meta property="og:title" name="title" );
@@ -185,9 +164,28 @@
         $head_content .= LJ::ehtml( $meta{'image'} );
         $head_content .= qq( " />\n);
     }
+
+    if ( $opts->{dont_show_nav_strip} ) {
+        $head_content .= _get_html_dont_show_navstrip();
+    }
     return $head_content;
 }
 
+sub _get_html_dont_show_navstrip {
+
+    return qq{<style type="text/css">
+                html body {
+                    padding-top: 0 !important;
+                }
+                #lj_controlstrip,
+                .w-cs,
+                .b-message-mobile,
+                .appwidget-sitemessages {
+                    display: none !important;
+                }
+            </style>};
+}
+
 sub _day_page_head {
     my ($self) = @_;