Bug 18427: Add a primary key to serialitems

[koha.git] / about.pl

diff --git a/about.pl b/about.pl
index 3e1240b..ef91b24 100755 (executable)
--- a/about.pl
+++ b/about.pl
@@ -81,12 +81,22 @@ my $effective_caching_method = ref($cache->cache);
 # FIXME What are the consequences of that??
 my $is_memcached_still_active = $cache->set_in_cache('test_for_about_page', "just a simple value");
 
+my $where_is_memcached_config = 'nowhere';
+if ( $ENV{MEMCACHED_SERVERS} and C4::Context->config('memcached_servers') ) {
+    $where_is_memcached_config = 'both';
+} elsif ( $ENV{MEMCACHED_SERVERS} and not C4::Context->config('memcached_servers') ) {
+    $where_is_memcached_config = 'ENV_only';
+} elsif ( C4::Context->config('memcached_servers') ) {
+    $where_is_memcached_config = 'config_only';
+}
+
 $template->param(
     effective_caching_method => $effective_caching_method,
     memcached_servers   => $memcached_servers,
     memcached_namespace => $memcached_namespace,
     is_memcached_still_active => $is_memcached_still_active,
-    memcached_running   => Koha::Caches->get_instance->memcached_cache
+    where_is_memcached_config => $where_is_memcached_config,
+    memcached_running   => Koha::Caches->get_instance->memcached_cache,
 );
 
 # Additional system information for warnings
@@ -118,6 +128,7 @@ my $errZebraConnection = C4::Context->Zconn("biblioserver",0)->errcode();
 my $warnIsRootUser   = (! $loggedinuser);
 
 my $warnNoActiveCurrency = (! defined Koha::Acquisition::Currencies->get_active);
+
 my @xml_config_warnings;
 
 my $context = new C4::Context;
@@ -297,6 +308,7 @@ $template->param(
     errZebraConnection => $errZebraConnection,
     warnIsRootUser => $warnIsRootUser,
     warnNoActiveCurrency => $warnNoActiveCurrency,
+    warnNoTemplateCaching => ( C4::Context->config('template_cache_dir') ? 0 : 1 ),
     xml_config_warnings => \@xml_config_warnings,
     warnStatisticsFieldsError => $warnStatisticsFieldsError,
 );
@@ -304,7 +316,7 @@ $template->param(
 my @components = ();
 
 my $perl_modules = C4::Installer::PerlModules->new;
-$perl_modules->version_info;
+$perl_modules->versions_info;
 
 my @pm_types = qw(missing_pm upgrade_pm current_pm);