From 11caedbf1906dedd5a5c2692a2098d157f4fe380 Mon Sep 17 00:00:00 2001 From: Mason James Date: Tue, 2 Apr 2013 21:20:12 +1300 Subject: [PATCH] Bug 7853 - opac-maintanance.pl should correctly redirect back to opac-main.pl, if no updates are outstanding Signed-off-by: Owen Leonard Works exactly as it should according to the test plan. This is a nice improvement. Signed-off-by: Jonathan Druart Amended patch: Check OpacMaintenance! Signed-off-by: Marcel de Rooy Signed-off-by: Jared Camins-Esakov --- opac/maintenance.pl | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/opac/maintenance.pl b/opac/maintenance.pl index 1914644dbf..d106098edb 100755 --- a/opac/maintenance.pl +++ b/opac/maintenance.pl @@ -15,9 +15,9 @@ # with Koha; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - use strict; use warnings; + # FIXME - Generates a warning from C4/Context.pm (uninitilized value). use CGI; @@ -36,4 +36,15 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( } ); -output_html_with_http_headers $input, '', $template->output; +my $koha_db_version = C4::Context->preference('Version'); +my $kohaversion = C4::Context::KOHAVERSION; +$kohaversion =~ s/(.*\..*)\.(.*)\.(.*)/$1$2$3/; + +#warn "db: $koha_db_version, koha: $kohaversion"; + +if ( $kohaversion > $koha_db_version or C4::Context->preference('OpacMaintenance') ) { + output_html_with_http_headers $input, '', $template->output; +} +else { + print $input->redirect("/cgi-bin/koha/opac-main.pl"); +} -- 2.39.5