- fixes for the following bugs:

#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

phpBB/install/database_update.php

@@ -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]}' ";
 			}

phpBB/install/install_install.php

@@ -1471,12 +1471,13 @@ class install_install extends module
 			if (is_dir($path) && !is_link($path) && file_exists($path . '/iso.txt'))
 			{
 				$lang_pack = file("{$phpbb_root_path}language/$path/iso.txt");
+
 				$sql_ary = array(
 					'lang_iso'			=> basename($path),
 					'lang_dir'			=> basename($path),
 					'lang_english_name'	=> trim(htmlspecialchars($lang_pack[0])),
-					'lang_local_name'	=> trim(htmlspecialchars($lang_pack[1])),
-					'lang_author'		=> trim(htmlspecialchars($lang_pack[2])),
+					'lang_local_name'	=> trim(htmlspecialchars($lang_pack[1], ENT_COMPAT, 'UTF-8')),
+					'lang_author'		=> trim(htmlspecialchars($lang_pack[2], ENT_COMPAT, 'UTF-8')),
 				);
 
 				$db->sql_query('INSERT INTO ' . LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));

phpBB/install/schemas/firebird_schema.sql

@@ -161,7 +161,7 @@ END;;
 CREATE TABLE phpbb_bbcodes (
 	bbcode_id INTEGER DEFAULT 0 NOT NULL,
 	bbcode_tag VARCHAR(16) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	bbcode_helpline VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	bbcode_helpline VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	display_on_posting INTEGER DEFAULT 0 NOT NULL,
 	bbcode_match BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
 	bbcode_tpl BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,

phpBB/install/schemas/mysql_40_schema.sql

@@ -111,7 +111,7 @@ CREATE TABLE phpbb_banlist (
 CREATE TABLE phpbb_bbcodes (
 	bbcode_id tinyint(3) DEFAULT '0' NOT NULL,
 	bbcode_tag varchar(16) DEFAULT '' NOT NULL,
-	bbcode_helpline varchar(255) DEFAULT '' NOT NULL,
+	bbcode_helpline text NOT NULL,
 	display_on_posting tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	bbcode_match text NOT NULL,
 	bbcode_tpl mediumtext NOT NULL,

phpBB/install/schemas/oracle_schema.sql

@@ -252,7 +252,7 @@ END;
 CREATE TABLE phpbb_bbcodes (
 	bbcode_id number(3) DEFAULT '0' NOT NULL,
 	bbcode_tag varchar2(16) DEFAULT '' ,
-	bbcode_helpline varchar2(255) DEFAULT '' ,
+	bbcode_helpline varchar2(765) DEFAULT '' ,
 	display_on_posting number(1) DEFAULT '0' NOT NULL,
 	bbcode_match clob DEFAULT '' ,
 	bbcode_tpl clob DEFAULT '' ,