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

(-)a/Koha/Template/Plugin/Koha.pm (-10 / +2 lines)
Lines 24-29 use base qw( Template::Plugin ); Link Here
24
use C4::Context;
24
use C4::Context;
25
use Koha::Token;
25
use Koha::Token;
26
use Koha;
26
use Koha;
27
use Koha::Status;
27
use Koha::Cache::Memory::Lite;
28
use Koha::Cache::Memory::Lite;
28
29
29
=head1 NAME
30
=head1 NAME
Lines 110-125 Missing POD for Version. Link Here
110
=cut
111
=cut
111
112
112
sub Version {
113
sub Version {
113
    my $version_string = Koha::version();
114
    return Koha::Status->new()->version();
114
    my ( $major, $minor, $maintenance, $development ) = split( '\.', $version_string );
115
116
    return {
117
        major       => $major,
118
        minor       => $minor,
119
        release     => $major . "." . $minor,
120
        maintenance => $major . "." . $minor . "." . $maintenance,
121
        development => ( $development ne '000' ) ? $development : undef,
122
    };
123
}
115
}
124
116
125
=head3 GenerateCSRF
117
=head3 GenerateCSRF
(-)a/t/Koha_Template_Plugin_Koha.t (-3 / +4 lines)
Lines 63-69 subtest "Koha::Template::Plugin::Koha::Version tests" => sub { Link Here
63
            minor       => $minor,
63
            minor       => $minor,
64
            release     => $major . "." . $minor,
64
            release     => $major . "." . $minor,
65
            maintenance => $major . "." . $minor . "." . $maintenance,
65
            maintenance => $major . "." . $minor . "." . $maintenance,
66
            development => $development
66
            development => $development,
67
            version     => $version,
67
        },
68
        },
68
        "Correct development version"
69
        "Correct development version"
69
    );
70
    );
Lines 82-88 subtest "Koha::Template::Plugin::Koha::Version tests" => sub { Link Here
82
            minor       => $minor,
83
            minor       => $minor,
83
            release     => $major . "." . $minor,
84
            release     => $major . "." . $minor,
84
            maintenance => $major . "." . $minor . "." . $maintenance,
85
            maintenance => $major . "." . $minor . "." . $maintenance,
85
            development => undef
86
            development => undef,
87
            version     => $version,
86
        },
88
        },
87
        "Correct maintenance version"
89
        "Correct maintenance version"
88
    );
90
    );
89
- 

Return to bug 41107