diff options
Diffstat (limited to 'phpBB/includes')
-rw-r--r-- | phpBB/includes/db/oracle.php | 2 | ||||
-rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 4 |
2 files changed, 3 insertions, 3 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); |