diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-26 16:38:33 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-26 16:38:33 +0000 |
| commit | 1b32236b1ebbf046e84a435c97c7ed6bc9edd5f9 (patch) | |
| tree | fb368f22ddc4ca85ba81b455cc05c756f533f6a1 /phpBB/includes/session.php | |
| parent | fda482ce2921bdaa5c5c61a1e288461701cea6b7 (diff) | |
| download | forums-1b32236b1ebbf046e84a435c97c7ed6bc9edd5f9.tar forums-1b32236b1ebbf046e84a435c97c7ed6bc9edd5f9.tar.gz forums-1b32236b1ebbf046e84a435c97c7ed6bc9edd5f9.tar.bz2 forums-1b32236b1ebbf046e84a435c97c7ed6bc9edd5f9.tar.xz forums-1b32236b1ebbf046e84a435c97c7ed6bc9edd5f9.zip | |
hopefully not too late in the game. Checked in new jabber class (the class done by the flyspray project). It would be nice if this could be tested with more servers - jabber.org seems to work fine...
- other fixes
git-svn-id: file:///svn/phpbb/trunk@7687 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index f771f71c22..f650eda9f4 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1712,7 +1712,7 @@ class user extends session $img_data = &$imgs[$img]; - if (empty($img_data) || $width !== false) + if (empty($img_data)) { if (!isset($this->img_array[$img])) { @@ -1735,7 +1735,7 @@ class user extends session break; case 'width': - return $img_data['width']; + return ($width === false) ? $img_data['width'] : $width; break; case 'height': @@ -1743,7 +1743,9 @@ class user extends session break; default: - return '<img src="' . $img_data['src'] . '"' . (($img_data['width']) ? ' width="' . $img_data['width'] . '"' : '') . (($img_data['height']) ? ' height="' . $img_data['height'] . '"' : '') . ' alt="' . $alt . '" title="' . $alt . '" />'; + $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; } } |