Bug 19088: plugins-upload causes error log noise

[koha.git] / admin / preferences.pl

diff --git a/admin/preferences.pl b/admin/preferences.pl
index d9683f1..032789f 100755 (executable)
--- a/admin/preferences.pl
+++ b/admin/preferences.pl
@@ -28,7 +28,7 @@ use C4::ClassSource;
 use C4::Log;
 use C4::Output;
 use C4::Templates;
-use C4::Budgets qw(GetCurrency);
+use Koha::Acquisition::Currencies;
 use File::Spec;
 use IO::File;
 use YAML::Syck qw();
@@ -45,10 +45,10 @@ sub GetTab {
 
     my $tab_template = C4::Templates::gettemplate( 'admin/preferences/' . $tab . '.pref', 'intranet', $input );
 
-    my $active_currency = GetCurrency();
+    my $active_currency = Koha::Acquisition::Currencies->get_active;
     my $local_currency;
     if ($active_currency) {
-        $local_currency = $active_currency->{currency};
+        $local_currency = $active_currency->currency;
     }
     $tab_template->param(
         local_currency => $local_currency, # currency code is used, because we do not know how a given currency is formatted.
@@ -186,6 +186,15 @@ sub TransformPrefsToHTML {
                         push @chunks, $piece;
                     }
                 } else {
+                    if ( $piece ) {
+                        my $version = Koha::version();
+                        my ( $major, $minor, $maintenance, $development ) = split( '\.', $version );
+                        if ( $minor % 2 ) {
+                            $piece =~ s|__VERSION__|${major}_${minor}|g;
+                        } else {
+                            $piece =~ s|__VERSION__|master|g;
+                        }
+                    }
                     push @chunks, { type_text => 1, contents => $piece };
                 }
             }
@@ -314,7 +323,6 @@ if ( $op eq 'save' ) {
             my $value = join( ',', $input->param( $param ) );
 
             C4::Context->set_preference( $pref, $value );
-            logaction( 'SYSTEMPREFERENCE', 'MODIFY', undef, $pref . " | " . $value );
         }
     }