Index: trunk/core/kernel/startup.php
===================================================================
diff -u -r2329 -r2373
--- trunk/core/kernel/startup.php	(.../startup.php)	(revision 2329)
+++ trunk/core/kernel/startup.php	(.../startup.php)	(revision 2373)
@@ -9,7 +9,14 @@
 define('INPORTAL_ENV', 1);
 
 if (!isset($_SERVER['DOCUMENT_ROOT']) || !$_SERVER['DOCUMENT_ROOT']) {
-	$_SERVER['DOCUMENT_ROOT'] = str_replace('\\', '/', str_replace($_SERVER['PATH_INFO'], '', FULL_PATH));
+	$full_path = str_replace('\\', '/', dirname(FULL_PATH));
+	if (!isset($_SERVER['PATH_INFO'])) {
+		$_SERVER['PATH_INFO'] = $_SERVER['PHP_SELF'];
+	}
+	$path_info = str_replace('\\', '/', dirname($_SERVER['PATH_INFO']));
+	
+//	echo "replacing ".$path_info.' (path_info) with "" in '.$full_path.' (full_path) = '.str_replace($path_info, '', $full_path).'<br>';
+	$_SERVER['DOCUMENT_ROOT'] = str_replace($path_info, '', $full_path);
 }
 
 $doc_root = rtrim(realpath($_SERVER['DOCUMENT_ROOT']), '/');
Index: trunk/kernel/admin_templates/regional/languages_edit.tpl
===================================================================
diff -u -r1763 -r2373
--- trunk/kernel/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 1763)
+++ trunk/kernel/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 2373)
@@ -72,7 +72,7 @@
 		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="lang" field="PrimaryLang" title="!la_fld_PrimaryLang!"/>
 		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="lang" field="Enabled" title="!la_fld_Enabled!"/>
 		<inp2:m_ParseBlock name="inp_edit_options" prefix="lang" field="UnitSystem" title="!la_fld_UnitSystem!" use_phrases="1"/>
-	<inp2:m_if prefix="lang" function="IsNew" inverse="inverse"/>	
+	<inp2:m_if check="lang_IsNew" inverse="inverse">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_inc param="tab_index" by="1"/>
 		<td class="text">
@@ -90,7 +90,7 @@
 		</td>
 		<td class="error">&nbsp;</td>
 	</tr>
-	<inp2:m_endif/>
+	</inp2:m_if>
 </table>	
 
 <inp2:m_include t="incs/footer"/>