Index: branches/RC/core/units/general/helpers/mod_rewrite_helper.php
===================================================================
diff -u -r11843 -r11854
--- branches/RC/core/units/general/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 11843)
+++ branches/RC/core/units/general/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 11854)
@@ -555,56 +555,6 @@
 				return $vars;
 			}
 
-			/*if ( $module_prefix = $this->ProcessModuleItem($url_parts, $vars) ) {
-				$passed[] = $module_prefix;
-				return $vars;
-			}*/
-
-			/*// match module
-			$next_template = $this->HTTPQuery->Get('next_template');
-			if ($url_part || $next_template)
-			{
-				if ($next_template)
-				{
-					$next_template_parts = explode('/', $next_template);
-					$module_folder = array_shift($next_template_parts);
-				}
-				else
-				{
-					$module_folder = $url_part;
-				}
-
-				foreach ($this->Application->ModuleInfo as $module_name => $module_data)
-				{
-					if ( trim($module_data['TemplatePath'], '/') == $module_folder )
-					{
-						$module_prefix = $module_data['Var'];
-						break;
-					}
-				}
-			}*/
-
-			/*if ( $this->ProcessPage($url_parts, $vars) ) {
-				if (count($passed) == 1) {// passed contains only 1 value which is 'm'
-					// this may be search results page, so we need to find out the module, especially for old in-portal
-					foreach ($this->Application->ModuleInfo as $module_name => $module_data) {
-						if (!$module_data['TemplatePath']) continue;
-						if ( preg_match('/^' . preg_quote($module_data['TemplatePath'], '/') . '/i', $vars['t']) )
-						{
-							$module_prefix = $module_data['Var'];
-							break;
-						}
-					}
-					$passed[] = $module_prefix;
-				}
-				return $vars;
-			}
-
-			if ( $module_prefix = $this->ProcessModuleItem($url_parts, $vars, false) ) {
-				$passed[] = $module_prefix;
-				return $vars;
-			}*/
-
 			if (!$found) {
 				$not_found = $this->Application->ConfigValue('ErrorTemplate');
 				$vars['t'] = $not_found ? $not_found : 'error_notfound';