Bug #3537 ยป FLOW3_Subroute_placeholders_appear_in_URL_if_no_replaced_3537.patch

patch - Bastian Waidelich, 2009-06-02 22:44

View differences:

Classes/Configuration/Manager.php (working copy)
52 52
	protected $packageManager;
53 53

  
54 54
	/**
55
	 * @var \F3\FLOW3\Log\SystemLoggerInterface
56
	 */
57
	protected $systemLogger;
58

  
59
	/**
55 60
	 * @var string The application context of the configuration to manage
56 61
	 */
57 62
	protected $context;
......
105 110
	}
106 111

  
107 112
	/**
113
	 * Injects the system logger
114
	 *
115
	 * @param \F3\FLOW3\Log\SystemLoggerInterface $systemLogger
116
	 * @return void
117
	 * @author Bastian Waidelich <bastian@typo3.org>
118
	 * @internal
119
	 */
120
	public function injectSystemLogger(\F3\FLOW3\Log\SystemLoggerInterface $systemLogger) {
121
		$this->systemLogger = $systemLogger;
122
	}
123

  
124
	/**
108 125
	 * Returns an array with the settings defined for the specified package.
109 126
	 *
110 127
	 * @param string $packageKey Key of the package to return the settings for
......
313 330
			$mergedSubRoutesConfiguration = array($routeConfiguration);
314 331
			foreach($routeConfiguration['subRoutes'] as $subRouteKey => $subRouteOptions) {
315 332
				if (!isset($subRouteOptions['package']) || !isset($subRoutesConfiguration[$subRouteOptions['package']])) {
316
					continue;
333
					$this->systemLogger->log('ConfigurationManager mergeRoutesWithSubRoutes(): Referenced Subroutes "' . $subRouteKey . '" couldn\'t be loaded.', LOG_WARNING);
334
					continue 2;
317 335
				}
318 336
				$packageSubRoutesConfiguration = $subRoutesConfiguration[$subRouteOptions['package']];
319 337
				$mergedSubRoutesConfiguration = $this->buildSubrouteConfigurations($mergedSubRoutesConfiguration, $packageSubRoutesConfiguration, $subRouteKey);
    (1-1/1)