Fix a regression with controllers for specific formats.

realityking · Nov 21, 2011 · dd7c846 · dd7c846
1 parent a3a9975
commit dd7c846
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/libraries/joomla/application/component/controller.php b/libraries/joomla/application/component/controller.php
@@ -270,8 +270,10 @@ public static function getInstance($prefix, $config = array())
 			$task = $command;
 
 			// Define the controller filename and path.
-			$file = self::createFileName('controller', array('name' => 'controller', 'format' => $format));
-			$path = $basePath . '/' . $file;
+			$file		 = self::createFileName('controller', array('name' => 'controller', 'format' => $format));
+			$path		 = $basePath . '/' . $file;
+			$backupfile  = self::createFileName('controller', array('name' => 'controller'));
+			$backuppath  = $basePath . '/' . $backupfile;
 		}
 
 		// Get the controller class name.
@@ -285,6 +287,10 @@ public static function getInstance($prefix, $config = array())
 			{
 				require_once $path;
 			}
+			elseif (isset($backuppath) && file_exists($backuppath))
+			{
+				require_once $backuppath;
+			}
 			else
 			{
 				throw new InvalidArgumentException(JText::sprintf('JLIB_APPLICATION_ERROR_INVALID_CONTROLLER', $type, $format));