mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-08 00:25:19 +02:00
Code Issues Releases Wiki Activity

oki doki

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@8041 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-08-17 16:02:21 +00:00
parent 021fec01b2
commit aecc7c9178
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/install/data/new_normalizer.php
View File

@ -174,7 +174,7 @@ class utf_new_normalizer
include($phpbb_root_path . 'includes/utf/data/utf_canonical_comp.' . $phpEx);
}
return utf_normalizer::recompose($str, $pos, $len, &$qc, &$decomp_map);
return utf_normalizer::recompose($str, $pos, $len, $qc, $decomp_map);
}
}

15
phpBB/install/database_update.php
View File

@ -510,7 +510,7 @@ while ($row = $db->sql_fetchrow($result))
$db->sql_freeresult($result);
echo $lang['PREVIOUS_VERSION'] . ' :: <strong>' . $config['version'] . '</strong><br />';
echo $lang['UPDATED_VERSION'] . ' :: <strong>' . $updates_to_version . '</strong>';
echo $lang['UPDATED_VERSION'] . ' :: <strong>' . $updates_to_version . '</strong></p>';
$current_version = str_replace('rc', 'RC', strtolower($config['version']));
$latest_version = str_replace('rc', 'RC', strtolower($updates_to_version));
@ -554,7 +554,7 @@ if (version_compare($current_version, '3.0.RC4', '<='))
));
}
?>
</p><br /><br />
<br /><br />
<h1><?php echo $lang['CLEANING_USERNAMES']; ?></h1>
@ -767,6 +767,8 @@ if (version_compare($current_version, '3.0.RC4', '<='))
}
$db->sql_freeresult($result);
_write_result(false, $errored, $error_ary);
// now retrieve all information about the users and let the admin decide what to do
if (sizeof($colliding_users))
{
@ -822,7 +824,7 @@ if (version_compare($current_version, '3.0.RC4', '<='))
// for the admin: keep name, change name (with text input) or delete user
$u_action = "database_update.$phpEx?language=$language&amp;type=$inline_update";
?>
</strong></p><br /><br />
<br /><br />
<p><?php echo $lang['CHANGE_CLEAN_NAMES']; ?></p>
<form id="change_clean_names" method="post" action="<?php echo $u_action; ?>">
@ -984,8 +986,6 @@ if ($exit)
exit;
}
_write_result(false, $errored, $error_ary);
// Schema updates
?>
<br /><br />
@ -1583,8 +1583,6 @@ add_log('admin', 'LOG_UPDATE_DATABASE', $orig_version, $updates_to_version);
// Now we purge the session table as well as all cache files
$cache->purge();
exit;
?>
</div>
@ -1604,6 +1602,9 @@ exit;
<?php
exit;
/**
* Function for triggering an sql statement
*/