Prevent under E_STRICT - Strict Standards: opendir(/var/www/hosts/mediawiki/wiki...

[lhc/web/wiklou.git] / includes / Image.php

diff --git a/includes/Image.php b/includes/Image.php
index 2774508..4c6beaf 100644 (file)
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -1317,16 +1317,17 @@ class Image
                        $files = array();
                        $dir = wfImageThumbDir( $this->name, $shared );
 
-                       // This generates an error on failure, hence the @
-                       $handle = @opendir( $dir );
-
-                       if ( $handle ) {
-                               while ( false !== ( $file = readdir($handle) ) ) {
-                                       if ( $file{0} != '.' ) {
-                                               $files[] = $file;
+                       if ( is_dir( $dir ) ) {
+                               $handle = opendir( $dir );
+       
+                               if ( $handle ) {
+                                       while ( false !== ( $file = readdir($handle) ) ) {
+                                               if ( $file{0} != '.' ) {
+                                                       $files[] = $file;
+                                               }
                                        }
+                                       closedir( $handle );
                                }
-                               closedir( $handle );
                        }
                } else {
                        $files = array();