diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-08-06 14:41:37 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-08-06 14:41:37 +0000 |
| commit | 4d3add1686c222596f2875b71f77cdd587e42b16 (patch) | |
| tree | 9c790a89f4cdc06c4fbfdaec17c97d556a9bd7a8 | |
| parent | dca78b88a07f87d72edc9dc113f88b36883e2527 (diff) | |
| download | forums-4d3add1686c222596f2875b71f77cdd587e42b16.tar forums-4d3add1686c222596f2875b71f77cdd587e42b16.tar.gz forums-4d3add1686c222596f2875b71f77cdd587e42b16.tar.bz2 forums-4d3add1686c222596f2875b71f77cdd587e42b16.tar.xz forums-4d3add1686c222596f2875b71f77cdd587e42b16.zip | |
two fixes
git-svn-id: file:///svn/phpbb/trunk@8011 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 3 | ||||
| -rw-r--r-- | phpBB/includes/functions_posting.php | 12 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 7 |
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; } /** |