Index: branches/RC/admin/install/theme_select.php
===================================================================
diff -u -r8929 -r9105
--- branches/RC/admin/install/theme_select.php	(.../theme_select.php)	(revision 8929)
+++ branches/RC/admin/install/theme_select.php	(.../theme_select.php)	(revision 9105)
@@ -1,17 +1,17 @@
 					<td>
 						<img src="images/icon_install.gif" width="46" height="46" alt="" align="absmiddle">&nbsp;<span class="admintitle">Select Default Theme</span><br><br>
-						
+
 			      <?php section_header('Step '.$tmp_step.' - Select Default Theme'); ?>
 			      <table border=0 cellpadding=0 cellspacing=0 width="100%" class="toolbar">
 <?php include("install/toolbar.php"); ?>
 						</table>
 						<!-- toolbar button \\-->
-						
+
 						<table width="100%" border="0" cellspacing="0" cellpadding="0" class="tableborder">
 	            <tr valign="top">
 	            	<td width="60%" bgcolor="#F0F0F0">
 	            		<table width="100%" height="100%" border="0" cellspacing="0" cellpadding="4">
-				            <tr class="table-color2">  
+				            <tr class="table-color2">
 				              <td class="txt">
 				                <b>Default Theme:</b></td>
 				              <td>
@@ -20,13 +20,22 @@
 										$objThemes->Clear();
 										$objThemes->Query_Item("SELECT * FROM ".GetTablePrefix()."Theme");
 										$option_tpl = '<option value="%s"%s>%s</option>';
-										
+
 										$db =& inst_GetADODBConnection();
 										$modules_list = $db->GetCol('SELECT Name FROM '.GetTablePrefix().'Modules');
 										$name_selected = count($modules_list) == 2 && in_array('In-Commerce', $modules_list) ? 'onlinestore' : 'default';
-										
-										foreach($objThemes->Items as $t)
-										{
+
+										if ($name_selected == 'default') {
+											if (file_exists(FULL_PATH.'/themes/portal_2007')) {
+												$name_selected = 'portal_2007';
+											}
+
+											if (file_exists(FULL_PATH.'/themes/default2007')) {
+												$name_selected = 'default2007';
+											}
+										}
+
+										foreach ($objThemes->Items as $t) {
 										    $selected = $t->Get('Name') == $name_selected ? ' selected' : '';
 											echo sprintf($option_tpl, $t->Get('ThemeId'), $selected, $t->Get('Name') );
 										}
@@ -36,15 +45,15 @@
 				            </tr>
 				            <tr class="table-color2">
 				            	<td colspan="2"><p class="error"><?php if( isset($ThemeError) ) echo $ThemeError; ?></p><br/></td>
-				            </tr>				            				            				            				            				            
+				            </tr>
 				              <td>
 					          	<br>
                   				  <input TYPE="hidden" NAME ="state" VALUE="theme_set">
 				                  <input type="submit" name="submit_form" value="Select" class="button">
 								  <input type="reset" name="Cancel" value="Cancel" class="button" ONCLICK = "history.go(-1);">
 				                  <input type="hidden" name="UserPass" VALUE="<?php echo $UserPass; ?>">
 				                  <input type="hidden" name="UserName" VALUE="<?php echo $UserName; ?>">
-				                  <input type="hidden" name="next_step" value="<?php echo $next_step;?>">								  
+				                  <input type="hidden" name="next_step" value="<?php echo $next_step;?>">
 				                  <input type="hidden" name="install_type" value="<?php echo $install_type;?>">
 				              </td>
 				            </tr>