*** empty log message ***

[oss/stilllife.git] / forum / forum

diff --git a/forum/forum b/forum/forum
index d6304459f3f485a8a6f90d52e43caaf6bfece69b..cad48eff0feae9f0dd226426a1de8c39a7121839 100755 (executable)
--- a/forum/forum
+++ b/forum/forum
@@ -82,7 +82,7 @@ if ($cgi->request_method ne "POST") {
                                        exit;
                                } else {
                                        if (!$forum->{"authenticated"}) { 
-                                               $cgi->param("returnto",$cgi->uri(-full=>1));
+                                               $cgi->param("returnto",$cgi->url(-full=>1));
                                                show_template("login",$cgi,$forum);
                                                exit;
 
@@ -252,6 +252,7 @@ sub gettemplate {
        }
        my $tree = HTML::TreeBuilder->new_from_file($filename);
        fix_forum_links($forum,$tree,$url);
+       return $tree;
 }      
 #
 # Вывод шаблона формы. В шаблоне должна присутстовать форма с  
@@ -261,7 +262,8 @@ sub gettemplate {
 #
 sub show_template {
        my ($form,$cgi,$forum) = @_;
-       my $tree = get_template($forum,$form,$ENV{'PATH_INFO'});
+       my $tree = gettemplate($forum,$form,$ENV{'PATH_INFO'});
+
        # Находим форму с классом $form
        my $f = $tree->look_down("_tag","form",
                "name",$form);