3 files changed, 17 insertions, 5 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 41f0513029..1f6935fd47 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -204,8 +204,7 @@ p a {
 		<li>[Fix] Added label bindings to the custom profile fields in the ACP (Bug #13936) - patch provided by damnian</li>
 		<li>[Change] Made group avatar/rank changes more intuitive</li>
 		<li>[Fix] Give more feedback in icon/smilie management (Bug #13295)</li>
-
-
+		<li>[Fix] Correctly set user::lang_id (Bug #14010)</li>
 	</ul>
 
 	</div>
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 4b38919e81..9e7449cd50 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -652,11 +652,23 @@ function create_thumbnail($source, $destination, $mimetype)
 			if ($type['version'] == 1)
 			{
 				$new_image = imagecreate($new_width, $new_height);
+
+				if ($new_image === false)
+				{
+					return false;
+				}
+
 				imagecopyresized($new_image, $image, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
 			}
 			else
 			{
 				$new_image = imagecreatetruecolor($new_width, $new_height);
+
+				if ($new_image === false)
+				{
+					return false;
+				}
+
 				imagecopyresampled($new_image, $image, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
 			}
 
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 9d5f91a698..d1b70d41e5 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1190,6 +1190,7 @@ class user extends session
 	var $dst;
 
 	var $lang_name;
+	var $lang_id = false;
 	var $lang_path;
 	var $img_lang;
 	var $img_array = array();
@@ -1720,7 +1721,7 @@ class user extends session
 	{
 		global $config, $db;
 
-		if (isset($this->lang_id))
+		if (!empty($this->lang_id))
 		{
 			return $this->lang_id;
 		}
@@ -1734,10 +1735,10 @@ class user extends session
 			FROM ' . LANG_TABLE . "
 			WHERE lang_iso = '" . $db->sql_escape($this->lang_name) . "'";
 		$result = $db->sql_query($sql);
-		$lang_id = (int) $db->sql_fetchfield('lang_id');
+		$this->lang_id = (int) $db->sql_fetchfield('lang_id');
 		$db->sql_freeresult($result);
 
-		return $lang_id;
+		return $this->lang_id;
 	}
 
 	/**