Bug 24545: Fix license statements

[srvgit] / Koha / Cache / Object.pm

diff --git a/Koha/Cache/Object.pm b/Koha/Cache/Object.pm
index f201e95..954e51a 100644 (file)
--- a/Koha/Cache/Object.pm
+++ b/Koha/Cache/Object.pm
@@ -4,18 +4,18 @@ package Koha::Cache::Object;
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 =head1 NAME
 
@@ -71,7 +71,7 @@ sub TIESCALAR {
         $self->{'value'} = &{ $self->{'preload'} }( @{ $self->{'arguments'} } );
         if ( defined( $self->{'cache'} ) ) {
             $self->{'cache'}->set_in_cache( $self->{'key'}, $self->{'value'},
-                $self->{'timeout'}, $self->{'cache_type'} . '_cache' );
+                { expiry => $self->{'timeout'} } );
         }
         $self->{'lastupdate'} = time;
     }
@@ -90,9 +90,7 @@ sub FETCH {
     if ( !( $self->{'inprocess'} && defined( $self->{'value'} ) )
         && $self->{'cache'} )
     {
-        $self->{'value'} =
-          $self->{'cache'}
-          ->get_from_cache( $self->{'key'}, $self->{'cache_type'} . '_cache' );
+        $self->{'value'} = $self->{'cache'}->get_from_cache( $self->{'key'} );
         $self->{'lastupdate'} = $now;
     }
 
@@ -106,7 +104,7 @@ sub FETCH {
             $self->{'value'}, $index );
         if ( defined( $self->{'cache'} ) ) {
             $self->{'cache'}->set_in_cache( $self->{'key'}, $self->{'value'},
-                $self->{'timeout'}, $self->{'cache_type'} . '_cache' );
+                { expiry => $self->{'timeout'} } );
         }
         $self->{'lastupdate'} = $now;
     }
@@ -130,9 +128,9 @@ sub STORE {
         && $self->{'allowupdate'}
         && defined( $self->{'cache'} ) )
     {
-        $self->{'cache'}
-          ->set_in_cache( $self->{'key'}, $self->{'value'}, $self->{'timeout'},
-            $self->{'cache_type'} . '_cache' );
+        $self->{'cache'}->set_in_cache( $self->{'key'}, $self->{'value'},
+            { expiry => $self->{'timeout'} },
+        );
     }
 
     return $self->{'value'};
@@ -149,8 +147,7 @@ sub DESTROY {
         && $self->{'unset'}
         && defined( $self->{'cache'} ) )
     {
-        $self->{'cache'}->clear_from_cache( $self->{'key'},
-            $self->{'cache_type'} . '_cache' );
+        $self->{'cache'}->clear_from_cache( $self->{'key'} );
     }
 
     undef $self->{'value'};