diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index 6c8d69c4f1..69672ebec0 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -549,7 +549,11 @@ class acp_profile
 					}
 				}
 
-				if (!sizeof($error))
+				if (sizeof($error))
+				{
+					$submit = false;
+				}
+				else
 				{
 					$step = (isset($_REQUEST['next'])) ? $step + 1 : ((isset($_REQUEST['prev'])) ? $step - 1 : $step);
 				}
diff --git a/phpBB/includes/diff/renderer.php b/phpBB/includes/diff/renderer.php
index 9caa3ff89a..6b7f07cf9c 100644
--- a/phpBB/includes/diff/renderer.php
+++ b/phpBB/includes/diff/renderer.php
@@ -720,6 +720,7 @@ class diff_renderer_side_by_side extends diff_renderer
 				if (!empty($current_context))
 				{
 					$line = $current_context;
+					$current_context = '';
 
 					$output .= '<tr class="unmodified"><td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td>';
 					$output .= '<td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td></tr>';
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index 68c0d3edf1..df25451266 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -763,6 +763,8 @@ function make_clickable_callback($type, $whitespace, $url, $relative_url, $class
 		// set last_char to empty here, so the variable can be used later to
 		// check whether a character was removed
 		default:
+			$last_char = '';
+		break;
 	}
 
 	$short_url = (utf8_strlen($url) > 55) ? utf8_substr($url, 0, 39) . ' ... ' . utf8_substr($url, -10) : $url;
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index 96e125f2e8..3575768782 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -2201,7 +2201,7 @@ function remove_invalid_users()
 
 function convert_bbcode($message, $convert_size = true, $extended_bbcodes = false)
 {
-	static $orig, $repl, $origx, $replx;
+	static $orig, $repl, $origx, $replx, $str_from, $str_to;
 
 	if (empty($orig))
 	{
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index 65fab3551a..6155745c37 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -1413,7 +1413,7 @@ class session
 
 		$sql_ary = array(
 			'key_id'		=> (string) md5($key_id),
-			'last_ip'		=> (string) $user_id,
+			'last_ip'		=> (string) $user_ip,
 			'last_login'	=> (int) time()
 		);