kizu (ki_zu) wrote in changelog,
kizu
ki_zu
changelog

[ljcom] r7613: LJSUP-4815: bugfix

Committer: rkomarov
LJSUP-4815: bugfix

U   trunk/bin/upgrading/s2layers/sup/layout.s2
Modified: trunk/bin/upgrading/s2layers/sup/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/layout.s2	2009-08-28 12:28:28 UTC (rev 7612)
+++ trunk/bin/upgrading/s2layers/sup/layout.s2	2009-08-31 09:12:05 UTC (rev 7613)
@@ -1208,8 +1208,13 @@
 	var string addfriend = (not viewer_is_owner() and $addlink.url != "") ? $addlink.url : "";
     var string _nav_sub = ($addfriend ? """ <li class="item item-addfriend"><a class="btn btn-add" href="$addfriend"><span><span><span>$*text_friend_add</span></span></span></a></li> """ : "") + """ <li class="item item-rss"><a class="btn btn-rss" href="$rsslink"><span><span><span>RSS</span></span></span></a></li> """;
     if ($*active_theme == "x3") { $_nav_sub = ($addfriend ? """ <li class="item item-addfriend"><a href="$addfriend">$*text_friend_add</a></li> """ : "") + """ <li class="item item-rss"><a href="$rsslink">RSS</a></li> """; }
-    var string _h2 = """<h2>$.global_title</h2>""";
-    var string _h3 = ($.view == "friends")?"<h3>$*_FriendsPage.friends_title</h3>":"<h3>$.global_subtitle</h3>";
+    var string _h2 = """<h2><span>$.global_title</span></h2>""";
+    var string _h3 = "";
+	if ($.view == "friends" and $*_FriendsPage.friends_title != "") {
+		$_h3 = "<h3><span>$*_FriendsPage.friends_title</span></h3>";
+	} elseif ($.global_subtitle != "") {
+		$_h3 = "<h3><span>$.global_subtitle</span></h3>";
+	}
     var string _hfeed = ($.view=="recent" or $.view=="friends" or $.view=="day")?" hfeed":"";
     _Header();
 """

Subscribe

  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments