Skip to content

Instantly share code, notes, and snippets.

@hobodave
Created April 2, 2010 02:06
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save hobodave/352650 to your computer and use it in GitHub Desktop.
Save hobodave/352650 to your computer and use it in GitHub Desktop.
Index: Application/Module/Bootstrap.php
===================================================================
--- Application/Module/Bootstrap.php (revision 21732)
+++ Application/Module/Bootstrap.php (working copy)
@@ -74,7 +74,11 @@
$this->initResourceLoader();
// ZF-6545: ensure front controller resource is loaded
- if (!$this->hasPluginResource('FrontController')) {
+ if ($this->_application instanceof Zend_Application_Bootstrap_ResourceBootstrapper
+ && $this->_application->hasPluginResource('FrontController')
+ ) {
+ $this->registerPluginResource($this->_application->getPluginResource('FrontController'));
+ } else if (!$this->hasPluginResource('FrontController')) {
$this->registerPluginResource('FrontController');
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment