From b68de2323d6444b4b3685a98bbcb9500a38e45cb Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 16 Dec 2009 15:48:23 +0000
Subject: merge changes from 3.0.x branch

git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/install/install_install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install/install_install.php')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 1b8553fb7a..1cc1365752 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1212,7 +1212,7 @@ class install_install extends module
 		}
 
 		// Change prefix
-		$sql_query = preg_replace('#phpbb_#i', $data['table_prefix'], $sql_query);
+		$sql_query = preg_replace('# phpbb_([^\s]*) #i', ' ' . $data['table_prefix'] . '\1 ', $sql_query);
 
 		// Change language strings...
 		$sql_query = preg_replace_callback('#\{L_([A-Z0-9\-_]*)\}#s', 'adjust_language_keys_callback', $sql_query);
-- 
cgit v1.2.1