diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2009-12-07 12:56:17 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2009-12-07 12:56:17 +0000 |
| commit | db46647c9e82c33a689187387959c1b5f5daa22b (patch) | |
| tree | 3def7fc3d2848548cb04a20dddbf7145242ac60f /phpBB | |
| parent | fe6958d54f0b82a9dfd678005561d729f1ffcd44 (diff) | |
| download | forums-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')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index d8858f9970..fd19fe5972 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -103,6 +103,7 @@ <li>[Fix] Cleanly handle forum/topic not found in ATOM Feeds. (Bug #54295)</li> <li>[Fix] PHP 5.3 compatibility: Check if function dl() exists before calling it. (Bug #54665)</li> <li>[Fix] PHP 5.3 compatibility: Disable E_DEPRECATED on startup to keep set_magic_quotes_runtime(0) quiet. (Bug #54495)</li> + <li>[Fix] Correctly replace table prefix before inserting schema data into the database. (Bug #54815)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> <li>[Change] Use em dash instead of hyphen/minus as separator in ATOM Feeds item statistics. (Bug #53565)</li> </ul> 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); |