diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-01-03 14:04:12 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-01-03 14:04:12 +0000 |
| commit | 8b423ba3084fbe29ce83aef2a5f6ac5380ee006e (patch) | |
| tree | 7ec23ad2d9b040ee9bb570f26d11cd5a6e427cb1 | |
| parent | 73e18dcd5afd641b876dd6c4adae405f364cea0f (diff) | |
| download | forums-8b423ba3084fbe29ce83aef2a5f6ac5380ee006e.tar forums-8b423ba3084fbe29ce83aef2a5f6ac5380ee006e.tar.gz forums-8b423ba3084fbe29ce83aef2a5f6ac5380ee006e.tar.bz2 forums-8b423ba3084fbe29ce83aef2a5f6ac5380ee006e.tar.xz forums-8b423ba3084fbe29ce83aef2a5f6ac5380ee006e.zip | |
#16865
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8293 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 3 | ||||
| -rw-r--r-- | phpBB/style.php | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index d2e8fb02ae..d2e4ed52ee 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -89,6 +89,7 @@ <li>[Fix] Fix disabling of word censor, now possible again</li> <li>[Fix] Allow single quotes in db password to be stored within config.php in installer</li> <li>[Fix] Correctly quote db password for re-display in installer (Bug #16695 / thanks to m313 for reporting too - #s17235)</li> + <li>[Fix] Correctly handle empty imageset entries (Bug #16865)</li> </ul> <a name="v30rc8"></a><h3>1.i. Changes since 3.0.RC8</h3> diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 6149063dea..9411ec1ae6 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1477,6 +1477,7 @@ class user extends session $sql = 'SELECT image_name, image_filename, image_lang, image_height, image_width FROM ' . STYLES_IMAGESET_DATA_TABLE . ' WHERE imageset_id = ' . $this->theme['imageset_id'] . " + AND image_filename <> '' AND image_lang IN ('" . $db->sql_escape($this->img_lang) . "', '')"; $result = $db->sql_query($sql, 3600); @@ -1886,7 +1887,7 @@ class user extends session default: $use_width = ($width === false) ? $img_data['width'] : $width; - + return '<img src="' . $img_data['src'] . '"' . (($use_width) ? ' width="' . $use_width . '"' : '') . (($img_data['height']) ? ' height="' . $img_data['height'] . '"' : '') . ' alt="' . $alt . '" title="' . $alt . '" />'; break; } diff --git a/phpBB/style.php b/phpBB/style.php index f177d30c03..75c440bb63 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -116,6 +116,7 @@ if ($id) $sql = 'SELECT * FROM ' . STYLES_IMAGESET_DATA_TABLE . ' WHERE imageset_id = ' . $theme['imageset_id'] . " + AND image_filename <> '' AND image_lang IN ('" . $db->sql_escape($user_image_lang) . "', '')"; $result = $db->sql_query($sql, 3600); |