From a0a0825b18e75407e3dc032f87a1773f8dcee3a0 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Thu, 21 Sep 2017 13:17:37 +0200
Subject: [PATCH] [jan] Check for both the memcache and memcached extensions in
 test script (Bug #14691).

---
 horde/docs/CHANGES |  2 ++
 horde/lib/Test.php | 13 +++++++++++--
 horde/package.xml  |  4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/horde/docs/CHANGES b/horde/docs/CHANGES
index 6c7c8ac40e7..883e108eff6 100644
--- a/horde/docs/CHANGES
+++ b/horde/docs/CHANGES
@@ -2,6 +2,8 @@
 v5.2.18-git
 -----------
 
+[jan] Check for both the memcache and memcached extensions in test script (Bug
+      #14691).
 
 
 -------
diff --git a/horde/lib/Test.php b/horde/lib/Test.php
index 4992e790935..5de2c19dc65 100644
--- a/horde/lib/Test.php
+++ b/horde/lib/Test.php
@@ -143,8 +143,9 @@ class Horde_Test
             'error' => 'If you want to take full advantage of Horde\'s localization features and character set support, you will need the mbstring extension. Compile PHP with <code>--enable-mbstring</code> to activate the extension.'
         ),
         'memcache' => array(
-            'descrip' => 'memcached Support (memcache) (PECL extension)',
-            'error' => 'The memcache PECL extension is only needed if you are using a memcached server for caching or sessions. See horde/docs/INSTALL for information on how to install PECL/PHP extensions.'
+            'descrip' => 'Memcached Support (PECL extension)',
+            'error' => 'The memcache(d) PECL extension is only needed if you are using a Memcached server for caching or sessions. See horde/docs/INSTALL for information on how to install PECL/PHP extensions.',
+            'function' => '_checkMemcache'
         ),
         'mongo' => array(
             'descrip' => 'MongoDB support (PECL extension)',
@@ -535,6 +536,14 @@ protected function _checkMongo()
         return true;
     }
 
+    /**
+     */
+    protected function _checkMemcache()
+    {
+        return extension_loaded('memcached') ||
+            extension_loaded('memcache');
+    }
+
     /**
      * Checks the list of PHP settings.
      *
diff --git a/horde/package.xml b/horde/package.xml
index 8faf37acc09..cc932b230bf 100644
--- a/horde/package.xml
+++ b/horde/package.xml
@@ -39,7 +39,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
  <notes>
-* 
+* [jan] Check for both the memcache and memcached extensions in test script (Bug #14691).
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -4202,7 +4202,7 @@
    <date>2017-09-19</date>
    <license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
    <notes>
-* 
+* [jan] Check for both the memcache and memcached extensions in test script (Bug #14691).
    </notes>
   </release>
  </changelog>