Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #24157 by chx/Robin/...: changed file_exists() to is_file() to fix several problems with modules using theimage toolkit.

4.7.x
Dries Buytaert 2005-06-19 08:59:06 +00:00
parent abc16b1d6d
commit eb536bf5ec
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/image.inc
View File

@ -80,7 +80,7 @@ function image_toolkit_invoke($method, $params = array()) {
* 'mime_type': image's MIME type ('image/jpeg', 'image/gif', etc.) * 'mime_type': image's MIME type ('image/jpeg', 'image/gif', etc.)
*/ */
function image_get_info($file) { function image_get_info($file) {
if (!file_exists($file)) { if (!is_file($file)) {
return false; return false;
} }

2
includes/theme.inc
View File

@ -499,7 +499,7 @@ function theme_links($links, $delimiter = ' | ') {
* A string containing the image tag. * A string containing the image tag.
*/ */
function theme_image($path, $alt = '', $title = '', $attributes = NULL, $getsize = TRUE) { function theme_image($path, $alt = '', $title = '', $attributes = NULL, $getsize = TRUE) {
if (!$getsize || (file_exists($path) && (list($width, $height, $type, $image_attributes) = @getimagesize($path)))) { if (!$getsize || (is_file($path) && (list($width, $height, $type, $image_attributes) = @getimagesize($path)))) {
$attributes = drupal_attributes($attributes); $attributes = drupal_attributes($attributes);
return '<img src="'. check_url($path) .'" alt="'. check_plain($alt) .'" title="'. check_plain($title) .'" '. $image_attributes . $attributes .'/>'; return '<img src="'. check_url($path) .'" alt="'. check_plain($alt) .'" title="'. check_plain($title) .'" '. $image_attributes . $attributes .'/>';
} }