Trying to add the MOD “Select State/Province from Dropdown..

I am trying to add the MOD “Select State/Province from Dropdown Menu & set Country to Store Default” to my OSC Max 1.7. In my five stores three have the first version the other two have the second version. This MOD is simple to install but I ran into a problem with the Second version because of another MOD.

First Version worked just fine.
$Id: checkout_new_address.php,v 1.1.1.1 2005/01/15 06:43:55 Michael Sasek Exp $

<td class="main"><?php echo ENTRY_COUNTRY; ?></td>
Current find:
<td class="main"><?php echo tep_get_country_list('country') . ' ' . (tep_not_null(ENTRY_COUNTRY_TEXT) ? '<span class="inputRequirement">' . ENTRY_COUNTRY_TEXT . '</span>': ''); ?></td>
Replace with:

<td class="main"><?php echo tep_get_country_list('country', STORE_COUNTRY) . ' ' . (tep_not_null(ENTRY_COUNTRY_TEXT) ? '<span class="inputRequirement">' . ENTRY_COUNTRY_TEXT . '</span>': ''); ?></td>

Second Version there is a problem.

$Id: checkout_new_address.php,v 1.2.2.1.2.2 2005/09/21 20:57:32 Michael Sasek Exp $

<td class="main"><?php echo ENTRY_COUNTRY; ?></td>
<?php /* LINE CHANGED: MOD - Country-State Selector Added: ,$country,'onChange="return refresh_form(checkout_address);"' */ ?>
Find this:
<td class="main"><?php echo tep_get_country_list('country',$country,'onChange= "return refresh_form(checkout_address);"') . ' ' . (tep_not_null(ENTRY_COUNTRY_TEXT) ? '<span class="inputRequirement">' . ENTRY_COUNTRY_TEXT . '</span>': ''); ?></td>

Replace with:
<td class="main"><?php echo tep_get_country_list('country', STORE_COUNTRY) . ' ' . (tep_not_null(ENTRY_COUNTRY_TEXT) ? '<span class="inputRequirement">' . ENTRY_COUNTRY_TEXT . '</span>': ''); ?></td>

The problem is when you go to edit “my account” address information the above doesn’t retain your selected “state information”.

My question is how do I add STORE_COUNTRY to the already MOD line of

<td class="main"><?php echo tep_get_country_list('country', (should it go here?) or where???$country,'onChange="return refresh_form(checkout_address);"') . ' ' . (tep_not_null(ENTRY_COUNTRY_TEXT) ? '<span class="inputRequirement">' . ENTRY_COUNTRY_TEXT . '</span>': ''); ?></td>

Thanks,
Jacob

Never mind! I figured out the difference between these two checkout new address.php pages. I checked my upgrade notes on both sites and discovered back in the beginning I added the bugfix_85. And after further investigation in the bugtracker forum I found this fix is for v2 only and not 1.7.
Thanks,
Jacob