Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332883 )

Change subject: Check extension_loaded() in RedisConnectionPool since 
class_exist() fails sometimes
......................................................................

Check extension_loaded() in RedisConnectionPool since class_exist() fails 
sometimes

This avoids the exception in cases were the build-in zend extension class *is* 
present.

Change-Id: I1f053896abeb13a56d3f3f6ac826678ee6b62314
---
M includes/libs/redis/RedisConnectionPool.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/83/332883/1

diff --git a/includes/libs/redis/RedisConnectionPool.php 
b/includes/libs/redis/RedisConnectionPool.php
index 7f43436..961eeee 100644
--- a/includes/libs/redis/RedisConnectionPool.php
+++ b/includes/libs/redis/RedisConnectionPool.php
@@ -74,7 +74,7 @@
         * @throws Exception
         */
        protected function __construct( array $options ) {
-               if ( !class_exists( 'Redis' ) ) {
+               if ( !class_exists( 'Redis' ) && !extension_loaded( 'redis' ) ) 
{
                        throw new RuntimeException(
                                __CLASS__ . ' requires a Redis client library. 
' .
                                'See 
https://www.mediawiki.org/wiki/Redis#Setup' );

-- 
To view, visit https://gerrit.wikimedia.org/r/332883
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f053896abeb13a56d3f3f6ac826678ee6b62314
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to