Implemented a fall-back if the first compressor class doesn't work

[core.git] / inc / classes / middleware / compressor / class_CompressorChannel.php

diff --git a/inc/classes/middleware/compressor/class_CompressorChannel.php b/inc/classes/middleware/compressor/class_CompressorChannel.php
index 0aa8205bae87b861829914996c346062639a8e69..8830de87020d0c7425550fa8d02ef16fb5c3cec6 100644 (file)
--- a/inc/classes/middleware/compressor/class_CompressorChannel.php
+++ b/inc/classes/middleware/compressor/class_CompressorChannel.php
@@ -62,17 +62,24 @@ class CompressorChannel extends BaseMiddleware implements Registerable {
                        $dirPointer = FrameworkDirectoryPointer::createFrameworkDirectoryPointer($baseDir);
 
                        // Read all directories but no sub directories
-                       while ($directoryEntry = $dirPointer->readDirectoryExcept(array('..', '.', '.htaccess', '.svn'))) {
+                       while ($directoryEntry = $dirPointer->readDirectoryExcept(array('..', '.', '.htaccess', '.svn', 'class_NullCompressor.php'))) {
                                // Is this a class file?
                                if ((substr($directoryEntry, 0, 6) == 'class_') && (substr($directoryEntry, -4, 4) == '.php')) {
-                                       // Get the compressor's name. That's why you must name
-                                       // your files like your classes and also that's why you
-                                       // must keep on class in one file.
+                                       /* Get the compressor's name. That's why you must name
+                                        * your files like your classes and also that's why you
+                                        * must keep on class in one file.
+                                        */
                                        $className = substr($directoryEntry, 6, -4);
 
                                        // Get an instance from our object factory
                                        $tempInstance = ObjectFactory::createObjectByName($className);
 
+                                       // Is it null?
+                                       if (is_null($tempInstance)) {
+                                               // Then skip to the next one
+                                               continue;
+                                       } // END - if
+
                                        // Set the compressor
                                        $compressorInstance->setCompressor($tempInstance);