Moved all SQL statements from PHP files into relevant *_db.inc files.

[fa-stable.git] / includes / main.inc

diff --git a/includes/main.inc b/includes/main.inc
index f01bcddcd30dc4f97a502a3942d2663a40c65b2f..fcb8b99ac5ac4c7ce4ac4fbb3fe073e64bba5a01 100644 (file)
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -61,7 +61,7 @@ function flush_dir($path, $wipe = false)
 {
        $dir = opendir($path);
        while(false !== ($fname = readdir($dir))) {
-               if($fname=='.' || $fname=='..' || (!$wipe && $fname=='index.php')) continue;
+               if($fname=='.' || $fname=='..' || $fname=='CVS' || (!$wipe && $fname=='index.php')) continue;
                if(is_dir($path.'/'.$fname)) {
                    flush_dir($path.'/'.$fname, $wipe);
                    if ($wipe) @rmdir($path.'/'.$fname);
@@ -276,7 +276,7 @@ function array_remove(&$array, $index, $len=1)
        array_splice($array, $index, $len);
 }
 
-function array_replace(&$array, $index, $len, $elements)
+function array_substitute(&$array, $index, $len, $elements)
 {
        array_splice($array, $index, $len);
        array_insert($array, $index, $elements);