- Patch #24157 by chx/Robin/...: changed file_exists() to is_file() to fix several problems with modules using theimage toolkit.
parent
abc16b1d6d
commit
eb536bf5ec
|
@ -80,7 +80,7 @@ function image_toolkit_invoke($method, $params = array()) {
|
|||
* 'mime_type': image's MIME type ('image/jpeg', 'image/gif', etc.)
|
||||
*/
|
||||
function image_get_info($file) {
|
||||
if (!file_exists($file)) {
|
||||
if (!is_file($file)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -499,7 +499,7 @@ function theme_links($links, $delimiter = ' | ') {
|
|||
* A string containing the image tag.
|
||||
*/
|
||||
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);
|
||||
return '<img src="'. check_url($path) .'" alt="'. check_plain($alt) .'" title="'. check_plain($title) .'" '. $image_attributes . $attributes .'/>';
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue