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

(-)a/C4/Installer.pm (-10 / +13 lines)
Lines 314-328 sub load_sql_in_order { Link Here
314
    $request->execute;
314
    $request->execute;
315
    my ($systempreference) = $request->fetchrow;
315
    my ($systempreference) = $request->fetchrow;
316
    $systempreference = '' unless defined $systempreference; # avoid warning
316
    $systempreference = '' unless defined $systempreference; # avoid warning
317
    # Make sure subtag_registry.sql is loaded second
317
318
    my $subtag_registry = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/mandatory/subtag_registry.sql";
318
    my $global_mandatory_dir = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/mandatory";
319
    unshift(@fnames, $subtag_registry);
319
320
    # Make sure authorised value categories are loaded at the beginning
320
    # Make sure some stuffs are loaded first
321
    my $av_cat = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/mandatory/auth_val_cat.sql";
321
    unshift(@fnames, C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/sysprefs.sql");
322
    unshift(@fnames, $av_cat);
322
    unshift(@fnames,
323
    # Make sure the global sysprefs.sql file is loaded first
323
        "$global_mandatory_dir/subtag_registry.sql",
324
    my $globalsysprefs = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/sysprefs.sql";
324
        "$global_mandatory_dir/auth_val_cat.sql",
325
    unshift(@fnames, $globalsysprefs);
325
        "$global_mandatory_dir/message_transport_types.sql",
326
        "$global_mandatory_dir/sample_notices_message_attributes.sql",
327
        "$global_mandatory_dir/sample_notices_message_transports.sql",
328
    );
329
326
    push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/userflags.sql";
330
    push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/userflags.sql";
327
    push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/userpermissions.sql";
331
    push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/userpermissions.sql";
328
    push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/audio_alerts.sql";
332
    push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/audio_alerts.sql";
329
- 

Return to bug 21651