Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.258
diff -u -r1.258 theme.inc
--- includes/theme.inc 8 Sep 2005 19:17:34 -0000 1.258
+++ includes/theme.inc 11 Sep 2005 19:32:22 -0000
@@ -527,9 +527,15 @@
* A string containing the image tag.
*/
function theme_image($path, $alt = '', $title = '', $attributes = NULL, $getsize = TRUE) {
- if (!$getsize || (is_file($path) && (list($width, $height, $type, $image_attributes) = @getimagesize($path)))) {
+ if (is_file($path)) {
$attributes = drupal_attributes($attributes);
- return '';
+
+ if ($getsize && (list($width, $height) = @getimagesize($path))) {
+ return '';
+ }
+ else {
+ return '';
+ }
}
}
Index: modules/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system.module,v
retrieving revision 1.233
diff -u -r1.233 system.module
--- modules/system.module 8 Sep 2005 20:25:08 -0000 1.233
+++ modules/system.module 11 Sep 2005 19:22:01 -0000
@@ -137,7 +137,7 @@
// Screenshot column.
$screenshot = dirname($value->filename) .'/screenshot.png';
- $row[] = file_exists($screenshot) ? theme('image', $screenshot, t('Screenshot for %theme theme', array('%theme' => $value->name)), '', array('class' => 'screenshot'), false) : t('no screenshot');
+ $row[] = file_exists($screenshot) ? theme('image', $screenshot, t('Screenshot for %theme theme', array('%theme' => $value->name)), '', array('class' => 'screenshot')) : t('no screenshot');
// Information field.
$row[] = ''. $value->name .'';
@@ -476,7 +476,7 @@
$row = array();
// Screenshot column.
- $row[] = file_exists($info->screenshot) ? theme('image', $info->screenshot, t('Screenshot for %theme theme', array('%theme' => $info->name)), '', array('class' => 'screenshot'), false) : t('no screenshot');
+ $row[] = file_exists($info->screenshot) ? theme('image', $info->screenshot, t('Screenshot for %theme theme', array('%theme' => $info->name)), '', array('class' => 'screenshot')) : t('no screenshot');
// Information field.
$row[] = "$info->name
" . dirname($info->filename) . '';