fixed threading

This commit is contained in:
JT Smith 2005-10-13 22:01:58 +00:00
parent 27dd87faa0
commit 7b04c8ec78
8 changed files with 1163 additions and 28 deletions

View file

@ -142,7 +142,7 @@ Formats the url to change the layout of a thread.
=head3 layout
A string indicating the type of layout to use. Can be flat, nested, or threaded.
A string indicating the type of layout to use. Can be flat or nested.
=cut
@ -631,11 +631,9 @@ sub view {
$var->{'layout.nested.url'} = $self->getLayoutUrl("nested");
$var->{'layout.flat.url'} = $self->getLayoutUrl("flat");
$var->{'layout.threaded.url'} = $self->getLayoutUrl("threaded");
my $layout = $session{scratch}{discussionLayout} || $session{user}{discussionLayout};
$var->{'layout.isFlat'} = ($layout eq "flat");
$var->{'layout.isNested'} = ($layout eq "nested");
$var->{'layout.isThreaded'} = ($layout eq "threaded" || !($var->{'layout.isNested'} || $var->{'layout.isFlat'}));
$var->{'layout.isNested'} = ($layout eq "nested" || !$var{'layout.isFlat'});
$var->{'user.isSubscribed'} = $self->isSubscribed;
$var->{'subscribe.url'} = $self->getSubscribeUrl;

View file

@ -174,7 +174,6 @@ sub appendTemplateLabels {
$var->{"synopsis.label"} = $i18n->get("synopsis");
$var->{"thumbnail.label"} = $i18n->get("thumbnail");
$var->{"title.label"} = $i18n->get("title");
$var->{"layout.threaded.label"} = $i18n->get("threaded");
$var->{"unlock.label"} = $i18n->get("unlock");
$var->{"unstick.label"} = $i18n->get("unstick");
$var->{"unsubscribe.label"} = $i18n->get("unsubscribe");