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

- fixes for the following bugs:

Browse Source 
#5326
#5318
#5304
#5290
#5288
#5278
#5276
#5272
#5266
- also fixed the "Call-time pass-by-reference" bug #5252
- within this step changed the normalize calls to require references.
- added captcha size variables to the class scope (suggestion was posted at area51)


git-svn-id: file:///svn/phpbb/trunk@6584 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-11-15 15:35:50 +00:00
parent 979e36077f
commit 548cc2c10b
38 changed files with 240 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
phpBB/install/database_update.php
View File

@@ -8,7 +8,7 @@
*
*/
$updates_to_version = '3.0.B2';
$updates_to_version = '3.0.B4-dev';
if (defined('IN_PHPBB') && defined('IN_INSTALL'))
{
@@ -284,23 +284,21 @@ $unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP');
$database_update_info = array(
// Changes within this version
'3.0.b3' => array(
/*
// Change the following columns...
'change_columns' => array(
{table} => array(
{column_name} => array('USINT', 0), -> column type
BBCODES_TABLE => array(
'bbcode_helpline' => array('VCHAR_UNI', ''),
),
),
// Add the following columns
/* Add the following columns
'add_columns' => array(
{table} => array(
{column_name} => array('USINT', 0), -> column type
),
),
*/
),*/
),
// Latest version
'3.0.0' => array(),
'3.0.b4-dev' => array(),
);
// Determine mapping database type
@@ -459,7 +457,7 @@ switch ($current_version)
// No need to change here, before no break should appear
break;
case '3.0.0':
case '3.0.b4-dev':
default:
$no_updates = true;
break;
@@ -483,13 +481,13 @@ flush();
/* update the version
$sql = "UPDATE " . CONFIG_TABLE . "
SET config_value = '$updates_to_version'
WHERE config_name = 'version'";
_sql($sql, $errored, $error_ary);
*/
// Optimize/vacuum analyze the tables where appropriate
/* Optimize/vacuum analyze the tables where appropriate
// this should be done for each version in future along with
// the version number update
switch ($db->sql_layer)
@@ -534,7 +532,7 @@ $cache->purge();
</div>
<div id="page-footer">
Powered by phpBB &copy; 2006 <a href="http://www.phpbb.com/">phpBB Group</a>
Powered by phpBB &copy; <?php echo date('Y'); ?> <a href="http://www.phpbb.com/">phpBB Group</a>
</div>
</div>
@@ -550,6 +548,11 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true)
{
global $db;
if (defined('DEBUG_EXTRA'))
{
echo "\n{$sql}\n";
}
$db->sql_return_on_error(true);
$result = $db->sql_query($sql);
@@ -732,7 +735,7 @@ function prepare_column_data($dbms, $column_data)
$sql .= " {$column_type} ";
// For hexadecimal values do not use single quotes
if (!is_null($column_data[1]))
if (!is_null($column_data[1]) && substr($column_type, -4) !== 'text')
{
$sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
}