Changeset 16786 for branches

Timestamp:

2007/11/13 19:57:23 (19 years ago)

Author:

satou

Message:

#184
修正しました。

Location:

branches/feature-module-update

Files:

• convert.php (modified) (1 diff)
• data/class/batch/SC_Batch_Update.php (modified) (1 diff)
• html/install/index.php (modified) (1 diff)

branches/feature-module-update/convert.php

@@ -118 +118 @@
     static $alldirs = array();
     $dirs = glob($dir . '/*');
-    if (count($dirs) > 0) {
+    if (is_array($dirs) && count($dirs) > 0) {
         foreach ($dirs as $d) $alldirs[] = $d;
     }
-    foreach ($dirs as $dir) listdirs($dir);
+    if (is_array($dirs)) {
+        foreach ($dirs as $dir) listdirs($dir);
+    }
     return $alldirs;
 }

branches/feature-module-update/data/class/batch/SC_Batch_Update.php

@@ -141 +141 @@
         static $alldirs = array();
         $dirs = glob($dir . '/*');
-        if (count($dirs) > 0) {
+        if (is_array($dirs) && count($dirs) > 0) {
             foreach ($dirs as $d) $alldirs[] = $d;
         }
-        foreach ($dirs as $dir) $this->listdirs($dir);
+        if (is_array($dirs)) {
+            foreach ($dirs as $dir) $this->listdirs($dir);
+        }
         return $alldirs;
     }

branches/feature-module-update/html/install/index.php

@@ -1101 +1101 @@
     global $alldirs;
     $dirs = glob($dir . '/*');
-    if (count($dirs) > 0) {
+    if (is_array($dirs) && count($dirs) > 0) {
         foreach ($dirs as $d) $alldirs[] = $d;
     }
-    foreach ($dirs as $dir) listdirs($dir);
+    if (is_array($dirs)) {
+        foreach ($dirs as $dir) listdirs($dir);
+    }
     return $alldirs;
 }