From 7d09b9b4bb58e71f0e7b895ef32059ad08d12416 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 2 Dec 2012 23:57:37 -0500
Subject: [PATCH] [ticket/9983] Add phpbb prefix to global variables.

PHPBB3-9983
---
 tests/RUNNING_TESTS.txt                          | 4 ++--
 tests/test_framework/phpbb_test_case_helpers.php | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/RUNNING_TESTS.txt b/tests/RUNNING_TESTS.txt
index 395cf1240a..75a6fc94f6 100644
--- a/tests/RUNNING_TESTS.txt
+++ b/tests/RUNNING_TESTS.txt
@@ -80,8 +80,8 @@ or port must be specified in test configuration. This can be done via
 test_config.php as follows:
 
     <?php
-    $redis_host = 'localhost';
-    $redis_port = 6379;
+    $phpbb_redis_host = 'localhost';
+    $phpbb_redis_port = 6379;
 
 Or via environment variables as follows:
 
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index b56a699d1c..fe15eded90 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -92,13 +92,13 @@ class phpbb_test_case_helpers
 				$config['phpbb_functional_url'] = $phpbb_functional_url;
 			}
 
-			if (isset($redis_host))
+			if (isset($phpbb_redis_host))
 			{
-				$config['redis_host'] = $redis_host;
+				$config['redis_host'] = $phpbb_redis_host;
 			}
-			if (isset($redis_port))
+			if (isset($phpbb_redis_port))
 			{
-				$config['redis_port'] = $redis_port;
+				$config['redis_port'] = $phpbb_redis_port;
 			}
 		}