View | Details | Raw Unified | Return to bug 11349
Collapse All | Expand All

(-)a/C4/InstallAuth.pm (-2 lines)
Lines 111-117 sub get_template_and_user { Link Here
111
    my $path     = C4::Context->config('intrahtdocs'). "/prog/". $language;
111
    my $path     = C4::Context->config('intrahtdocs'). "/prog/". $language;
112
112
113
    my $tmplbase = $in->{template_name};
113
    my $tmplbase = $in->{template_name};
114
    $tmplbase=~ s/\.tmpl$/.tt/;
115
    my $filename = "$path/modules/" . $tmplbase;
114
    my $filename = "$path/modules/" . $tmplbase;
116
    my $interface = 'intranet';
115
    my $interface = 'intranet';
117
    my $template = C4::Templates->new( $interface, $filename, $tmplbase, $query);
116
    my $template = C4::Templates->new( $interface, $filename, $tmplbase, $query);
Lines 372-378 sub checkauth { Link Here
372
      C4::Context->config('intrahtdocs') . "/prog/"
371
      C4::Context->config('intrahtdocs') . "/prog/"
373
      . ( $query->param('language') ? $query->param('language') : "en" );
372
      . ( $query->param('language') ? $query->param('language') : "en" );
374
    my $filename = "$path/modules/$template_name";
373
    my $filename = "$path/modules/$template_name";
375
    $filename =~ s/\.tmpl$/.tt/;
376
    my $interface = 'intranet';
374
    my $interface = 'intranet';
377
    my $template = C4::Templates->new( $interface, $filename, '', $query);
375
    my $template = C4::Templates->new( $interface, $filename, '', $query);
378
    $template->param(
376
    $template->param(
(-)a/C4/Templates.pm (-18 lines)
Lines 217-244 sub gettemplate { Link Here
217
    my ( $tmplbase, $interface, $query, $is_plugin ) = @_;
217
    my ( $tmplbase, $interface, $query, $is_plugin ) = @_;
218
    ($query) or warn "no query in gettemplate";
218
    ($query) or warn "no query in gettemplate";
219
    my $path = C4::Context->preference('intranet_includes') || 'includes';
219
    my $path = C4::Context->preference('intranet_includes') || 'includes';
220
    $tmplbase =~ s/\.tmpl$/.tt/;
221
    my ($htdocs, $theme, $lang, $filename)
220
    my ($htdocs, $theme, $lang, $filename)
222
       =  _get_template_file($tmplbase, $interface, $query);
221
       =  _get_template_file($tmplbase, $interface, $query);
223
    $filename = $tmplbase if ( $is_plugin );
222
    $filename = $tmplbase if ( $is_plugin );
224
    my $template = C4::Templates->new($interface, $filename, $tmplbase, $query);
223
    my $template = C4::Templates->new($interface, $filename, $tmplbase, $query);
225
224
226
# NOTE: Commenting these out rather than deleting them so that those who need
227
# to know how we previously shimmed these directories will be able to understand.
228
#    my $is_intranet = $interface eq 'intranet';
229
#    my $themelang =
230
#        ($is_intranet ? '/intranet-tmpl' : '/opac-tmpl') .
231
#        "/$theme/$lang";
232
#    $template->param(
233
#        themelang => $themelang,
234
#        yuipath   => C4::Context->preference("yuipath") eq "local"
235
#                     ? "$themelang/lib/yui"
236
#                     : C4::Context->preference("yuipath"),
237
#        interface => $is_intranet ? '/intranet-tmpl' : '/opac-tmpl',
238
#        theme     => $theme,
239
#        lang      => $lang
240
#    );
241
242
    # Bidirectionality, must be sent even if is the only language
225
    # Bidirectionality, must be sent even if is the only language
243
    my $current_lang = regex_lang_subtags($lang);
226
    my $current_lang = regex_lang_subtags($lang);
244
    my $bidi;
227
    my $bidi;
245
- 

Return to bug 11349