From 530b7e94c5e10eb1b9aa2ea488825265b685651e Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 21 May 2006 16:54:19 +0000
Subject: - fixing a few smaller bugs/glitches - init user session in cron.php
 (else it can produce errors if functions expect the user object being set) -
 fix sql escaping for mssql/mssql_odbc

git-svn-id: file:///svn/phpbb/trunk@5957 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/session.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes/session.php')

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 306a7e36e1..21a3e7f882 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1237,13 +1237,22 @@ class user extends session
 				return $imgs[$img . $suffix];
 			}
 
-			if ($width === false)
+			// Do not include dimensions?
+			if (strpos($this->theme[$img], '*') === false)
 			{
-				list($imgsrc, $height, $width) = explode('*', $this->theme[$img]);
+				$imgsrc = trim($this->theme[$img]);
+				$width = $height = false;
 			}
 			else
 			{
-				list($imgsrc, $height) = explode('*', $this->theme[$img]);
+				if ($width === false)
+				{
+					list($imgsrc, $height, $width) = explode('*', $this->theme[$img]);
+				}
+				else
+				{
+					list($imgsrc, $height) = explode('*', $this->theme[$img]);
+				}
 			}
 
 			if ($suffix !== '')
@@ -1262,19 +1271,19 @@ class user extends session
 		{
 			case 'src':
 				return $imgs[$img . $suffix]['src'];
-				break;
+			break;
 			
 			case 'width':
 				return $imgs[$img . $suffix]['width'];
-				break;
+			break;
 
 			case 'height':
 				return $imgs[$img . $suffix]['height'];
-				break;
+			break;
 
 			default:
 				return '<img src="' . $imgs[$img . $suffix]['src'] . '"' . (($imgs[$img . $suffix]['width']) ? ' width="' . $imgs[$img . $suffix]['width'] . '"' : '') . (($imgs[$img . $suffix]['height']) ? ' height="' . $imgs[$img . $suffix]['height'] . '"' : '') . ' alt="' . $alt . '" title="' . $alt . '" />';
-				break;
+			break;
 		}
 	}
 
-- 
cgit v1.2.1