1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 11:13:59 +02:00

- 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
This commit is contained in:
Meik Sievertsen
2006-05-21 16:54:19 +00:00
parent 2ddac10375
commit 530b7e94c5
27 changed files with 120 additions and 71 deletions

View File

@@ -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;
}
}