diff options
| -rw-r--r-- | phpBB/includes/db/firebird.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_display.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php index af8d523ab1..bc171e61be 100644 --- a/phpBB/includes/db/firebird.php +++ b/phpBB/includes/db/firebird.php @@ -297,7 +297,7 @@ class dbal_firebird extends dbal foreach (get_object_vars($cur_row) as $key => $value) { - $row[strtolower($key)] = trim(str_replace(array("\\0", "\\n"), array("\0", "\n"), $value)); + $row[strtolower($key)] = (is_string($value)) ? trim(str_replace(array("\\0", "\\n"), array("\0", "\n"), $value)) : $value; } return (sizeof($row)) ? $row : false; diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index a28d91a7e9..208226257d 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -997,7 +997,7 @@ function watch_topic_forum($mode, &$s_watching, &$s_watching_img, $user_id, $for $db->sql_freeresult($result); } - if (!is_null($notify_status)) + if (!is_null($notify_status) && $notify_status !== '') { if (isset($_GET['unwatch'])) { |