aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-03-12 10:11:17 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-03-12 10:11:17 +0000
commita41bc62dabae0ef778e47214a912bbf7730c6e7a (patch)
tree57a6da4b15a0603cbad5be664696d7dabaf77653
parent47a3bc1b081f0aa8766f87b51c8d25db75c203a8 (diff)
downloadforums-a41bc62dabae0ef778e47214a912bbf7730c6e7a.tar
forums-a41bc62dabae0ef778e47214a912bbf7730c6e7a.tar.gz
forums-a41bc62dabae0ef778e47214a912bbf7730c6e7a.tar.bz2
forums-a41bc62dabae0ef778e47214a912bbf7730c6e7a.tar.xz
forums-a41bc62dabae0ef778e47214a912bbf7730c6e7a.zip
use correct bbcode uid...
git-svn-id: file:///svn/phpbb/trunk@7173 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/develop/adjust_sizes.php1
-rw-r--r--phpBB/install/convertors/functions_phpbb20.php2
2 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/develop/adjust_sizes.php b/phpBB/develop/adjust_sizes.php
index 8683a5b9dc..9c0612dd8a 100644
--- a/phpBB/develop/adjust_sizes.php
+++ b/phpBB/develop/adjust_sizes.php
@@ -41,7 +41,6 @@ while ($row = $db->sql_fetchrow($result))
// Only if a bbcode uid is present, the signature present and a size tag used...
if ($bbcode_uid && $row['user_sig'] && strpos($row['user_sig'], '[size=') !== false)
{
-
$row['user_sig'] = preg_replace_callback('/\[size=(\d*):' . $bbcode_uid . '\]/', 'replace_size', $row['user_sig']);
$sql = 'UPDATE ' . USERS_TABLE . " SET user_sig = '" . $db->sql_escape($row['user_sig']) . "'
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
index 26f5407915..512f0598be 100644
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ b/phpBB/install/convertors/functions_phpbb20.php
@@ -1156,7 +1156,7 @@ function phpbb_prepare_message($message)
// Adjust size...
if (strpos($message, '[size=') !== false)
{
- $message = preg_replace_callback('/\[size=(\d*):' . $bbcode_uid . '\]/', 'replace_size', $message);
+ $message = preg_replace_callback('/\[size=(\d*):' . $convert->row['old_bbcode_uid'] . '\]/', 'replace_size', $message);
}
$message = preg_replace('/\:(([a-z0-9]:)?)' . $convert->row['old_bbcode_uid'] . '/s', '', $message);