Bug #31996 ยป workspaces_no_query_parameters.diff

Francois Suter, 2011-11-22 16:21

View differences:

Classes/Controller/PreviewController.php
78 78
	 * @return void
79 79
	 */
80 80
	public function indexAction() {
81
		// @todo language doesn't always come throught the L parameter
82
		// @todo Evaluate how the intval() call can be used with Extbase validators/filters
83
		$language = intval(t3lib_div::_GP('L'));
81
			// Get all the GET parameters to pass them on to the frames
82
		$queryParameters = t3lib_div::_GET();
83
			// Remove the GET parameters related to the workspaces module and the page id
84
		unset($queryParameters['tx_workspaces_web_workspacesworkspaces']);
85
		unset($queryParameters['M']);
86
		unset($queryParameters['id']);
87
			// Assemble a query string from the retrieved parameters
88
		$queryString = t3lib_div::implodeArrayForUrl('', $queryParameters);
84 89

  
85 90
		$controller = t3lib_div::makeInstance('Tx_Workspaces_Controller_ReviewController', TRUE);
86 91
		/** @var $uriBuilder Tx_Extbase_MVC_Web_Routing_UriBuilder */
......
92 97
		$wsSettingsUrl = $wsSettingsPath . $wsSettingsUri . $wsSettingsParams;
93 98

  
94 99
		$viewDomain = t3lib_BEfunc::getViewDomain($this->pageId);
95
		$wsBaseUrl =  $viewDomain . '/index.php?id=' . $this->pageId . '&L=' . $language;
100
		$wsBaseUrl =  $viewDomain . '/index.php?id=' . $this->pageId . $queryString;
96 101

  
97 102
		// @todo - handle new pages here
98 103
		// branchpoints are not handled anymore because this feature is not supposed anymore
    (1-1/1)