From b941582981610e1e07e1dbb3adb149d4b727808c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 8 Jun 2008 20:51:01 +0000 Subject: [PATCH] .svn directory ignored by many loaders --- application/selector/class_ApplicationSelector.php | 1 + .../main/database/databases/class_LocalFileDatabase.php | 4 ++-- inc/classes/middleware/compressor/class_CompressorChannel.php | 2 +- inc/loader/class_ClassLoader.php | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php index 5a03d60..ac5f1ad 100644 --- a/application/selector/class_ApplicationSelector.php +++ b/application/selector/class_ApplicationSelector.php @@ -47,6 +47,7 @@ class ApplicationSelector extends BaseFrameworkSystem { ".", "..", ".htaccess" + ".svn" ); /** diff --git a/inc/classes/main/database/databases/class_LocalFileDatabase.php b/inc/classes/main/database/databases/class_LocalFileDatabase.php index 25cc4ba..db1d87e 100644 --- a/inc/classes/main/database/databases/class_LocalFileDatabase.php +++ b/inc/classes/main/database/databases/class_LocalFileDatabase.php @@ -259,7 +259,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend // Initialize the search loop $isValid = false; - while ($dataFile = $dirInstance->readDirectoryExcept(array(".", "..", ".htaccess"))) { + while ($dataFile = $dirInstance->readDirectoryExcept(array(".", "..", ".htaccess", ".svn"))) { // Generate FQFN for testing $fqfn = sprintf("%s/%s", $pathName, $dataFile); $this->setLastFile($fqfn); @@ -559,7 +559,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend ); // Read the directory with some exceptions - while ($dataFile = $directoryInstance->readDirectoryExcept(array(".", "..", ".htaccess"))) { + while ($dataFile = $directoryInstance->readDirectoryExcept(array(".", "..", ".htaccess", ".svn"))) { $this->partialStub(sprintf("File %s found.", $dataFile)); } // END - while diff --git a/inc/classes/middleware/compressor/class_CompressorChannel.php b/inc/classes/middleware/compressor/class_CompressorChannel.php index 7330515..e512751 100644 --- a/inc/classes/middleware/compressor/class_CompressorChannel.php +++ b/inc/classes/middleware/compressor/class_CompressorChannel.php @@ -65,7 +65,7 @@ class CompressorChannel extends BaseMiddleware { $dirPointer = FrameworkDirectoryPointer::createFrameworkDirectoryPointer($baseDir); // Read all directories but no sub directories - while ($dir = $dirPointer->readDirectoryExcept(array("..", ".", ".htaccess"))) { + while ($dir = $dirPointer->readDirectoryExcept(array("..", ".", ".htaccess", ".svn"))) { // Is this a class file? if ((substr($dir, 0, 6) == "class_") && (substr($dir, -4, 4) == FrameworkConfiguration::getInstance()->readConfig('php_extension'))) { // Get the compressor's name. That's why you must name diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php index 825f8bf..a82f951 100644 --- a/inc/loader/class_ClassLoader.php +++ b/inc/loader/class_ClassLoader.php @@ -144,6 +144,7 @@ class ClassLoader { $ignoreList[] = "."; $ignoreList[] = ".."; $ignoreList[] = ".htaccess"; + $ignoreList[] = ".svn"; // Keep it in class for later usage $this->ignoreList = $ignoreList; -- 2.39.5