Skip to content

Commit

Permalink
[jan] Check for both the memcache and memcached extensions in test sc…
Browse files Browse the repository at this point in the history
…ript (Bug #14691).
  • Loading branch information
yunosh committed Sep 21, 2017
1 parent ede589f commit 53c995d
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 3 deletions.
8 changes: 8 additions & 0 deletions horde/docs/CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ v6.0.0-git
#13200).


-------
v5.2.17
-------

[jan] Fix returning to last URL after using the login link.
[jan] Officially support PHP 7.


-------
v5.2.16
-------
Expand Down
13 changes: 11 additions & 2 deletions horde/lib/Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,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)',
Expand Down Expand Up @@ -532,6 +533,14 @@ protected function _checkMongo()
return true;
}

/**
*/
protected function _checkMemcache()
{
return extension_loaded('memcached') ||
extension_loaded('memcache');
}

/**
* Checks the list of PHP settings.
*
Expand Down
15 changes: 14 additions & 1 deletion horde/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4320,13 +4320,26 @@
<stability>
<release>stable</release>
<api>stable</api></stability>
<date>2017-08-01</date>
<date>2017-09-19</date>
<license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
<notes>
* [jan] Fix returning to last URL after using the login link.
* [jan] Officially support PHP 7.
</notes>
</release>
<release>
<version>
<release>5.2.18</release>
<api>5.2.0</api></version>
<stability>
<release>stable</release>
<api>stable</api></stability>
<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>
<release>
<version>
<release>6.0.0</release>
Expand Down

0 comments on commit 53c995d

Please sign in to comment.