fix regression introduced in 54e2584. fix #169

Author: dbu

DependencyInjection/CmfRoutingExtension.php

@@ -132,14 +132,18 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
 
             if (null === $config['generic_controller']) {
                 throw new InvalidConfigurationException('If you configure templates_by_class, you need to configure a generic_router. If you are sure you do not need a generic router, set the field to false to disable explicitly.');
-            } elseif (is_string($config['generic_controller'])) {
+            }
+
+            if (is_string($config['generic_controller'])) {
                 // if the content class defines the template, we also need to make sure we use the generic controller for those routes
                 $controllerForTemplates = array();
                 foreach ($config['templates_by_class'] as $key => $value) {
                     $controllerForTemplates[$key] = $config['generic_controller'];
                 }
                 $container->setParameter($this->getAlias() . '.defined_templates_class', $controllerForTemplates);
                 $dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer_controller_for_templates_by_class')));
+            } else {
+                $container->removeDefinition($this->getAlias() . '.enhancer_controller_for_templates_by_class');
             }
         }
         if (!empty($config['route_filters_by_id'])) {