aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2009-12-07 12:56:17 +0000
committerAndreas Fischer <bantu@phpbb.com>2009-12-07 12:56:17 +0000
commitdb46647c9e82c33a689187387959c1b5f5daa22b (patch)
tree3def7fc3d2848548cb04a20dddbf7145242ac60f /phpBB/install
parentfe6958d54f0b82a9dfd678005561d729f1ffcd44 (diff)
downloadforums-db46647c9e82c33a689187387959c1b5f5daa22b.tar
forums-db46647c9e82c33a689187387959c1b5f5daa22b.tar.gz
forums-db46647c9e82c33a689187387959c1b5f5daa22b.tar.bz2
forums-db46647c9e82c33a689187387959c1b5f5daa22b.tar.xz
forums-db46647c9e82c33a689187387959c1b5f5daa22b.zip
Fix Bug #54815 - Only replace table prefix if table name is surrounded by whitespace.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10300 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/install_install.php2
1 files changed, 1 insertions, 1 deletions
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);