2 files changed, 3 insertions, 12 deletions
diff --git a/phpBB/includes/cache/driver/redis.php b/phpBB/includes/cache/driver/redis.php
index f0997c3cad..6362938a9e 100755
--- a/phpBB/includes/cache/driver/redis.php
+++ b/phpBB/includes/cache/driver/redis.php
@@ -25,12 +25,6 @@ if (!defined('PHPBB_ACM_REDIS_HOST'))
 	define('PHPBB_ACM_REDIS_HOST', 'localhost');
 }
 
-if (!defined('PHPBB_ACM_REDIS'))
-{
-	//can define multiple servers with host1/port1,host2/port2 format
-	define('PHPBB_ACM_REDIS', PHPBB_ACM_REDIS_HOST . '/' . PHPBB_ACM_REDIS_PORT);
-}
-
 /**
 * ACM for Redis
 *
@@ -51,12 +45,8 @@ class phpbb_cache_driver_redis extends phpbb_cache_driver_memory
 		parent::__construct();
 
 		$this->redis = new Redis();
-		foreach (explode(',', PHPBB_ACM_REDIS) as $server)
-		{
-			$parts = explode('/', $server);
-			$this->redis->connect(trim($parts[0]), trim($parts[1]));
-		}
-		
+		$this->redis->connect(PHPBB_ACM_REDIS_HOST, PHPBB_ACM_REDIS_PORT);
+
 		if (defined('PHPBB_ACM_REDIS_PASSWORD'))
 		{
 			if (!$this->redis->auth(PHPBB_ACM_REDIS_PASSWORD))
diff --git a/phpBB/includes/cache/service.php b/phpBB/includes/cache/service.php
index 68026c8647..0c01953d55 100644
--- a/phpBB/includes/cache/service.php
+++ b/phpBB/includes/cache/service.php
@@ -194,6 +194,7 @@ class phpbb_cache_service
 					'max_filesize'	=> (int) $row['max_filesize'],
 					'allow_group'	=> $row['allow_group'],
 					'allow_in_pm'	=> $row['allow_in_pm'],
+					'group_name'	=> $row['group_name'],
 				);
 
 				$allowed_forums = ($row['allowed_forums']) ? unserialize(trim($row['allowed_forums'])) : array();