@@ -, +, @@ C4::Context->preference($name) in admin/preferences.pl which uses cached preference values --- Koha/Config/SysPref.pm | 13 ------------- admin/preferences.pl | 6 +++--- t/db_dependent/sysprefs.t | 13 +------------ 3 files changed, 4 insertions(+), 28 deletions(-) --- a/Koha/Config/SysPref.pm +++ a/Koha/Config/SysPref.pm @@ -67,19 +67,6 @@ sub delete { return $deleted; } -=head3 select_systempreferences -my $row = Koha::Config::SysPref->select_systempreferences($name); - -This subroutine retrieves the value and type values for systempreference records with a specific variable value -=cut - -sub select_systempreferences { - my ($self, $name) = @_; - my $dbh = C4::Context->dbh; - my $row = $dbh->selectrow_hashref( "SELECT value, type FROM systempreferences WHERE variable = ?", {}, $name ); - return $row; -} - =head3 type =cut --- a/admin/preferences.pl +++ a/admin/preferences.pl @@ -158,12 +158,12 @@ sub TransformPrefsToHTML { my $name = $piece->{'pref'}; if ( $name ) { - my $row = Koha::Config::SysPref->select_systempreferences($name); + my $row = C4::Context->preference($name); my $value; - if ( ( !defined( $row ) || ( !defined( $row->{'value'} ) && $row->{'type'} ne 'YesNo' ) ) && defined( $piece->{'default'} ) ) { + if ( ( !defined( $row ) || ( !defined( $piece->{'value'} ) && $piece->{'type'} ne 'YesNo' ) ) && defined( $piece->{'default'} ) ) { $value = $piece->{'default'}; } else { - $value = $row->{'value'}; + $value = $piece->{'value'}; } my $chunk = _get_chunk( $value, %$piece ); --- a/t/db_dependent/sysprefs.t +++ a/t/db_dependent/sysprefs.t @@ -19,7 +19,7 @@ # along with Koha; if not, see . use Modern::Perl; -use Test::More tests => 9; +use Test::More tests => 8; use C4::Context; use Koha::Database; @@ -61,15 +61,4 @@ is(C4::Context->preference('testpreference'), 'def', 'caching preferences'); C4::Context->clear_syspref_cache(); is(C4::Context->preference('testpreference'), undef, 'clearing preference cache'); -sub select_systempreferences { - my ($name) = @_; - my $dbh = C4::Context->dbh; - my $sth = $dbh->selectrow_hashref( "SELECT value, type FROM systempreferences WHERE variable = ?", {}, $name ); - return $sth; -} - -my $syspref = select_systempreferences('OPACHEADER'); -is( $syspref->{'type'}, "Textarea", 'correct number of syspref found'); - - $dbh->rollback; --