customised s2 style broken by update

[taraljc]

I had customised my paid journal so that in addition to the "comment" link at the bottom of each journal entry in the default view, I also had edit, tag, and memorise links. The code which is no longer working is inside the cut.



function print_entry(Page p, Entry e, Color bgcolor, Color fgcolor)
{
$e->print_linkbar();

# Userpic

var string userpic = "";
if ($*show_entry_userpic)
{
if ($p.view == "friends")
{
if (defined $e.userpic)
{
$userpic = $userpic + """
";
}
}
elseif ($p.journal_type == "C" and $p.view == "recent")
{
if (defined $e.userpic)
{
$userpic = $userpic + """
""";
}
}
else
{
if (defined $e.userpic)
{
$userpic = $userpic + """

""";
}
}
}
print """

""";
if (($p.view == "recent" and $p.journal_type != "C" ) or $p.view == "entry" or $p.view == "day")
{
print """$userpic""";
}
else
{
if ($p.view == "recent" and $p.journal_type == "C" )
{
"""
""";
}
else
{
"""
""";
}
print """$userpic""";

# Poster

if ($p.view == "friends")
{
var UserLite linkto;
$linkto = $e.poster;
#print "$e.poster.username";
"""
base_url() + "\">";
"$linkto.username";
}
elseif ($p.journal_type == "C" and $p.view == "recent")
{
var UserLite linkto;
$linkto = $e.poster;
#print "$e.poster.username";
"""
base_url() + "\">";
"$linkto.username";
}
if ($p.view == "friends" and $e.poster.username != $e.journal.username)
{
var UserLite linkto;
$linkto = $e.journal;
"""
[ base_url() + "\">";
"$linkto.username]";
}
if ($p.view == "recent" and $p.journal_type == "C")
{
print "";
}
if ($p.view != "recent" and $p.view != "entry" and $p.view != "day")
{
print """""";
}
}

# Date, time, subject

var string time = "";
$time = $time + """ @ """;
$time = $time + $e.time->time_format("short");
var string date = "";
$date = $date + $e.time->date_format("long_day");
"""

""";
print $e.time->date_format("%%dd%% %%month%% %%yyyy%%");
"$time
";
"""

""";
if ($e.security != "")
{
$e.security_icon->print();
}
"""
$e.subject

""";

"""

""";
$e->print_text();

# Currents

var string currents ="";
$e->print_metadata();

# Comments

"""

""";
var Link edit;
var Link mem;
if ($p.view != "entry" or $p.view != "reply")
{
$edit = $e->get_link("edit_entry");
$tagedit = $e->get_link("edit_tags");
$mem = $e->get_link("mem_add");

if (defined $edit )
{
print """ $text_edit | """;
}

print """ $text_memories""";

if ($p.view != "entry" or $p.view != "reply")
{
$e.comments->print();
}
elseif ($e.comments.enabled)
{
$e.comments->print_postlink();
}
else
{
" ";
}
"""

""";
}
}

function CommentInfo::print() {
if (not $.enabled) { return; }
if ($.count > 0 or $.screened) {
print " | ";
$this->print_readlink();
}
print """ | """;
$this->print_postlink();
}

Does anyone have a fix, so that my journal style can work with the new updates?