View | Details | Raw Unified | Return to bug 16579
Collapse All | Expand All

(-)a/C4/Auth.pm (-1 / +2 lines)
Lines 32-37 use C4::Languages; Link Here
32 
use C4::Branch;       # GetBranches
 32 
use C4::Branch;       # GetBranches
33 
use C4::Search::History;
 33 
use C4::Search::History;
34 
use Koha;
 34 
use Koha;
35 
use Koha::Caches;
35 
use Koha::AuthUtils qw(hash_password);
 36 
use Koha::AuthUtils qw(hash_password);
36 
use Koha::LibraryCategories;
 37 
use Koha::LibraryCategories;
37 
use Koha::Libraries;
 38 
use Koha::Libraries;
Lines 1725-1731 sub get_session { Link Here
1725 
    elsif ( $storage_method eq 'Pg' ) {
 1726 
    elsif ( $storage_method eq 'Pg' ) {
1726 
        $session = new CGI::Session( "driver:PostgreSQL;serializer:yaml;id:md5", $sessionID, { Handle => $dbh } );
 1727 
        $session = new CGI::Session( "driver:PostgreSQL;serializer:yaml;id:md5", $sessionID, { Handle => $dbh } );
1727 
    }
 1728 
    }
1728 
    elsif ( $storage_method eq 'memcached' && C4::Context->ismemcached ) {
 1729 
    elsif ( $storage_method eq 'memcached' && Koha::Caches->get_instance->memcached_cache ) {
1729 
        $session = new CGI::Session( "driver:memcached;serializer:yaml;id:md5", $sessionID, { Memcached => C4::Context->memcached } );
 1730 
        $session = new CGI::Session( "driver:memcached;serializer:yaml;id:md5", $sessionID, { Memcached => C4::Context->memcached } );
1730 
    }
 1731 
    }
1731 
    else {
 1732 
    else {
(-)a/Koha/Cache.pm (-1 / +1 lines)
Lines 84-90 sub new { Link Here
84 
    unless ( $self->{namespace} and @servers ) {
 84 
    unless ( $self->{namespace} and @servers ) {
85 
        my $koha_config = Koha::Config->read_from_file( Koha::Config->guess_koha_conf() );
 85 
        my $koha_config = Koha::Config->read_from_file( Koha::Config->guess_koha_conf() );
86 
        $self->{namespace} ||= $koha_config->{config}{memcached_namespace} || 'koha';
 86 
        $self->{namespace} ||= $koha_config->{config}{memcached_namespace} || 'koha';
87 
        @servers ||= split /,/, $koha_config->{config}{memcached_servers};
 87 
        @servers = split /,/, $koha_config->{config}{memcached_servers} unless @servers;
88 
    }
 88 
    }
89 
    $self->{namespace} .= ":$subnamespace:";
 89 
    $self->{namespace} .= ":$subnamespace:";
90 

          90
          

        



(-)a/reports/guided_reports.pl
      (-2 / +2 lines)




  

    
      
            Lines 31-36
          use C4::Debug;
      
      
        Link Here
      
    
  

        

          31
          
use C4::Koha qw/GetFrameworksLoop/;

          31
          
use C4::Koha qw/GetFrameworksLoop/;

        

        

          32
          
use C4::Branch;

          32
          
use C4::Branch;

        

        

          33
          
use C4::Context;

          33
          
use C4::Context;

        

            

              
              
              34
              
use Koha::Caches;

            

        

          34
          
use C4::Log;

          35
          
use C4::Log;

        

        

          35
          
use Koha::DateUtils qw/dt_from_string output_pref/;

          36
          
use Koha::DateUtils qw/dt_from_string output_pref/;

        

        

          36
          
use Koha::AuthorisedValue;

          37
          
use Koha::AuthorisedValue;

        

  

    
      
            Lines 47-53
          Script to control the guided report creation
      
      
        Link Here
      
    
  

        

          47
          
=cut

          48
          
=cut

        

        

          48
          

          49
          

        

        

          49
          
my $input = new CGI;

          50
          
my $input = new CGI;

        

          
            

              50
              
my $usecache = C4::Context->ismemcached;


              51
              
my $usecache = Koha::Caches->get_instance->memcached_cache;

            

        

          51
          

          52
          

        

        

          52
          
my $phase = $input->param('phase') // '';

          53
          
my $phase = $input->param('phase') // '';

        

        

          53
          
my $flagsrequired;

          54
          
my $flagsrequired;

        

            

              54
              
- 

              
              
            






  

  Return to bug 16579