From 1808c43a1826f78ea6cfe531a7536dc9e41c830d Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Wed, 27 Sep 2017 07:50:48 +0000 Subject: [PATCH] Bug 19247 - Followup: QA test tool fixes Test plan: 1. Run QA test tools and notice that all files pass --- admin/preferences.pl | 1 - installer/featurereleasetool.pl | 3 --- .../intranet-tmpl/prog/en/includes/newsform.inc | 28 +++++++++++----------- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/admin/preferences.pl b/admin/preferences.pl index 4476e75..16fa2fd 100755 --- a/admin/preferences.pl +++ b/admin/preferences.pl @@ -33,7 +33,6 @@ use File::Spec; use IO::File; use YAML::Syck qw(); use List::MoreUtils qw(any); -use C4::Sysprefs; $YAML::Syck::ImplicitTyping = 1; $YAML::Syck::ImplicitUnicode = 1; our $lang; diff --git a/installer/featurereleasetool.pl b/installer/featurereleasetool.pl index 21259a5..08db5f1 100755 --- a/installer/featurereleasetool.pl +++ b/installer/featurereleasetool.pl @@ -99,10 +99,8 @@ my @logs = `cd $logdir && ls -t | grep "updatedatabase_2*"`; my $filename_suffix = $logs[0]; my $path = $logdir . '/' . $filename_suffix; -my $fh; my $file; my $count = 0; -my $version; $file = `cat $path`; $file = `echo "$file" | grep -Eo '?[0-9]+[.][0-9]+[.][0-9]+[.][0-9]+?'`; @@ -135,7 +133,6 @@ elsif ( $op && $op eq 'save' ) { #Submit changed systempreferences foreach my $param ( $query->param() ) { my ( $prefname ) = ( $param =~ /pref_(.*)/ ); next if ( !defined( $prefname ) ); - my $wholevalue = join( ',', $query->param($param) ); my ($name, $value) = split(/,/,$wholevalue); C4::Context->set_preference( $name, $value ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/newsform.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/newsform.inc index f2e740f..d42464e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/newsform.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/newsform.inc @@ -8,32 +8,32 @@ -
+
OPAC and Koha news
  1. @@ -54,12 +54,12 @@
  2. -
    [% INCLUDE 'date-format.inc' %]
    +
    [% INCLUDE 'date-format.inc' %]
  3. -
    [% INCLUDE 'date-format.inc' %]
    +
    [% INCLUDE 'date-format.inc' %]
  4. -- 2.1.4