From 22d778fcfffe08317e951d24bbaad94441ed4ab0 Mon Sep 17 00:00:00 2001
From: David M <davidmj@users.sourceforge.net>
Date: Fri, 28 Jul 2006 02:56:02 +0000
Subject: [PATCH] - Fix Oracle - Make MySQL schema a little different than the
 others... - Fix MCP_TOPIC

git-svn-id: file:///svn/phpbb/trunk@6212 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/db/oracle.php           |  2 +-
 phpBB/includes/mcp/mcp_topic.php       |  4 ++--
 phpBB/install/schemas/mysql_schema.sql | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index bc7bf5ec16..699005fd99 100644
--- a/phpBB/includes/db/oracle.php
+++ b/phpBB/includes/db/oracle.php
@@ -278,7 +278,7 @@ class dbal_oracle extends dbal
 			// OCI->CLOB?
 			if (is_object($value))
 			{
-				$value = ociloadlob($value);
+				$value = $value->load();
 			}
 			
 			$result_row[strtolower($key)] = $value;
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 92125cd14d..d9d84959c2 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -88,11 +88,11 @@ function mcp_topic_view($id, $mode, $action)
 	$result = $db->sql_query_limit($sql, $posts_per_page, $start);
 
 	$rowset = array();
-	$bbcode_bitfield = 0;
+	$bbcode_bitfield = '';
 	while ($row = $db->sql_fetchrow($result))
 	{
 		$rowset[] = $row;
-		$bbcode_bitfield |= $row['bbcode_bitfield'];
+		$bbcode_bitfield = $bbcode_bitfield | $row['bbcode_bitfield'];
 	}
 	$db->sql_freeresult($result);
 
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index f001d8b194..018f4ba22b 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -216,7 +216,7 @@ CREATE TABLE phpbb_forums (
 	forum_parents mediumtext DEFAULT '' NOT NULL,
 	forum_name text DEFAULT '' NOT NULL,
 	forum_desc text DEFAULT '' NOT NULL,
-	forum_desc_bitfield varbinary(255) DEFAULT '\0' NOT NULL,
+	forum_desc_bitfield varbinary(255) DEFAULT '' NOT NULL,
 	forum_desc_options int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	forum_desc_uid varchar(5) DEFAULT '' NOT NULL,
 	forum_link varchar(255) DEFAULT '' NOT NULL,
@@ -225,7 +225,7 @@ CREATE TABLE phpbb_forums (
 	forum_image varchar(255) DEFAULT '' NOT NULL,
 	forum_rules text DEFAULT '' NOT NULL,
 	forum_rules_link varchar(255) DEFAULT '' NOT NULL,
-	forum_rules_bitfield varbinary(255) DEFAULT '\0' NOT NULL,
+	forum_rules_bitfield varbinary(255) DEFAULT '' NOT NULL,
 	forum_rules_options int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	forum_rules_uid varchar(5) DEFAULT '' NOT NULL,
 	forum_topics_per_page tinyint(4) DEFAULT '0' NOT NULL,
@@ -288,7 +288,7 @@ CREATE TABLE phpbb_groups (
 	group_type tinyint(4) DEFAULT '1' NOT NULL,
 	group_name varchar(255) DEFAULT '' NOT NULL,
 	group_desc text DEFAULT '' NOT NULL,
-	group_desc_bitfield varbinary(255) DEFAULT '\0' NOT NULL,
+	group_desc_bitfield varbinary(255) DEFAULT '' NOT NULL,
 	group_desc_options int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	group_desc_uid varchar(5) DEFAULT '' NOT NULL,
 	group_display tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
@@ -430,7 +430,7 @@ CREATE TABLE phpbb_posts (
 	post_checksum varchar(32) DEFAULT '' NOT NULL,
 	post_encoding varchar(20) DEFAULT 'iso-8859-1' NOT NULL,
 	post_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	bbcode_bitfield varbinary(255) DEFAULT '\0' NOT NULL,
+	bbcode_bitfield varbinary(255) DEFAULT '' NOT NULL,
 	bbcode_uid varchar(5) DEFAULT '' NOT NULL,
 	post_edit_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	post_edit_reason text DEFAULT '' NOT NULL,
@@ -465,7 +465,7 @@ CREATE TABLE phpbb_privmsgs (
 	message_edit_user mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	message_encoding varchar(20) DEFAULT 'iso-8859-1' NOT NULL,
 	message_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	bbcode_bitfield varbinary(255) DEFAULT '\0' NOT NULL,
+	bbcode_bitfield varbinary(255) DEFAULT '' NOT NULL,
 	bbcode_uid varchar(5) DEFAULT '' NOT NULL,
 	message_edit_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	message_edit_count smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
@@ -992,7 +992,7 @@ CREATE TABLE phpbb_users (
 	user_avatar_height tinyint(4) DEFAULT '0' NOT NULL,
 	user_sig mediumtext DEFAULT '' NOT NULL,
 	user_sig_bbcode_uid varchar(5) DEFAULT '' NOT NULL,
-	user_sig_bbcode_bitfield varbinary(255) DEFAULT '\0' NOT NULL,
+	user_sig_bbcode_bitfield varbinary(255) DEFAULT '' NOT NULL,
 	user_from varchar(100) DEFAULT '' NOT NULL,
 	user_icq varchar(15) DEFAULT '' NOT NULL,
 	user_aim varchar(255) DEFAULT '' NOT NULL,