This file is a technical summary of changes in the Geodesic Solutions Classifieds and Auctions software. Each entry will link to the corresponding bug found in Bugzilla on our website (You will need current support contract to view, more info here).

17.01.0 (January 31, 2017)

• Enhancements (21)
• Security Fixes (0)
• Fixes/Maintenance (19)
• Template Changes (13)

[Enhancements]

1145 - New Addon: Profile Pictures
1282 - Updated TinyMCE to latest v4.5.1
1714 - New listing setting: minimum price - Sponsored
1718 - Price Drop Auctions: Added static drop amounts
1719 - Added ability to search by start date on Advanced Search - Sponsored
1724 - PHP7 Compatibility
1726 - Updated Mobile Detect library to 2.8.22
1727 - New Payment Gateway: Stripe
1732 - Updated CommWeb payment gateway to reflect API changes
1735 - Admin Text Export/Import Revamped
1737 - New Admin Design -- Modern Look, Responsive Templates!
1738 - Manage Orders / Manage Items pages now default to showing All, instead of Pending
1739 - Enhanced Stats display on Admin Home
1740 - Admin Search Users page completely reworked
1741 - Cleaned up Admin Remove User process
1742 - Removed Obsolete Setting: Site Setup > User Account Settings > My Account Home Type
1743 - Made Search Users result table sortable
1744 - Change List Users "joined date" format to be more useful
1745 - Added a search box to the admin List Users page
1746 - Moved the admin's User Importer into the Users / User Groups navigation category
1748 - Admin page navigation is now preserved after a session timeout

[Security Fixes]

- No Security fixes or patches for this release.

[Fixes/Maintenance]

1750 - Fixed a display error in Gallery Browsing
1715 - Fixed bad reference to template file in Provider Fee plan item
1717 - Corrected an issue that could have caused Seller-Buyer transactions to always take place in USD
1720 - Removed the netcash.com payment gateway, which seems to have gone out of business
1721 - Fixed an issue that could prevent certain listings with missing category data from being renewed
1725 - Fixed an interaction between multi-level fields and category searching that could sometimes cause the Advanced Search page to return incorrect results
1728 - Fixed active region filter being ignored in module pagination
1729 - Fixed module secondary pages ignoring language filters
1734 - Fixed some category data not being saved correctly when creating a new category
1751 - Fixed inability to disable Storefront Subscription plan items
1752 - Fixed admin resetting a listing duration clearing its attached payment options
1753 - Fixed Attention Getters not appearing on order information in a couple spots in the admin
1722 - Fixed a case where manually approving an incomplete order could lead to that order being deleted
1747 - Cleaned up some weird interactions between tabs in the Design Manager
1749 - The Anonymous Listings system user can no longer be deleted
1723 - Fixed admin home page miscounting total number of Better Placement ads when Better Placement Rotation is in use
1731 - Storefront: Fixed a missing text label on the My Account Info page
1733 - Restored a couple of missing images in the Feedback configuration section of the admin
1736 - Renamed password hash types

[Template Changes]

Reference Purposes Only: Like the rest of this changelog, the template changes below are for reference purposes only, not (necessarily) a list of changes everyone needs to follow. Refer to the full update instructions to find if you need to make any template changes during an update.

This is a line that has been Added
This is a line that has been Removed
This is a line that has not changed.

1. In file external/css/default.css
   
   
   1. Near line 645, FIND:
      

      	border-radius: 8px;
      	-webkit-border-radius: 8px;
      	-moz-border-radius: 8px;
      }
      
      /* ==========================================================================

      
      Replace With:

      	border-radius: 8px;
      	-webkit-border-radius: 8px;
      	-moz-border-radius: 8px;
      	max-width: 86px;
      }
      
      /* ==========================================================================

      Near line 645, make the following changes:

      	border-radius: 8px;
      	-webkit-border-radius: 8px;
      	-moz-border-radius: 8px;
      	max-width: 86px;
      }
      
      /* ==========================================================================

   2. Near line 1260, FIND:
      

      }
      
      #update_response .field {
          height: 16px;
          padding: 5px;
      }
      
      .advertise {

      
      Replace With:

      }
      
      #update_response .field {
          padding: 5px; 
      }
      
      .advertise {

      Near line 1260, make the following changes:

      }
      
      #update_response .field {
          height: 16px;
          padding: 5px;
          padding: 5px; 
      }
      
      .advertise {

2. In file external/js/gjmain.js
   
   
   1. Near line 160, FIND:
      

      		//for each gallery, but not across different galleries that might be on
      		//the page.
      		jQuery('.listing_set.gallery').has('.gallery_row').each(function(){
      			jQuery(this).find('.article_inner').gj('setMaxHeight');
      		});
      	},
      	/**

      
      Replace With:

      		//for each gallery, but not across different galleries that might be on
      		//the page.
      		jQuery('.listing_set.gallery').has('.gallery_row').each(function(){
      			//note that we first reset the height to "auto" and THEN calculate the max
      			//this is to fix an issue where galleries on a hidden tab have their height explicitly set to 0
      			jQuery(this).find('.article_inner').css('height','auto').gj('setMaxHeight');
      		});
      	},
      	/**

      Near line 160, make the following changes:

      		//for each gallery, but not across different galleries that might be on
      		//the page.
      		jQuery('.listing_set.gallery').has('.gallery_row').each(function(){
      			jQuery(this).find('.article_inner').gj('setMaxHeight');
      			//note that we first reset the height to "auto" and THEN calculate the max
      			//this is to fix an issue where galleries on a hidden tab have their height explicitly set to 0
      			jQuery(this).find('.article_inner').css('height','auto').gj('setMaxHeight');
      		});
      	},
      	/**

   2. Near line 1411, FIND:
      

       * TODO: move this into a plugin or something
       */
      var gjWysiwyg = {
      	editors : [],
      	
      	tinyLoaded : false,
      	localStorage : false,
      	
      	loadTiny : function () {
      		//This meant to be over-written by admin/client side

      
      Replace With:

       * TODO: move this into a plugin or something
       */
      var gjWysiwyg = {
      
      	
      	loadTiny : function () {
      		//This meant to be over-written by admin/client side

      Near line 1411, make the following changes:

       * TODO: move this into a plugin or something
       */
      var gjWysiwyg = {
      	editors : [],
      	
      	tinyLoaded : false,
      	localStorage : false,
      
      	
      	loadTiny : function () {
      		//This meant to be over-written by admin/client side

   3. Near line 1422, FIND:
      

      	},
      	
      	removeTiny : function () {
      		if (!gjWysiwyg.tinyLoaded) {
      			//nothing to do
      			//alert('not loaded, nothing to do!');
      			return;
      		}
      		if (gjWysiwyg.editors) {
      			gjWysiwyg.editors.each(function () {
      				var id = jQuery(this).attr('id');
      				if (tinyMCE.getInstanceById(id)) {
      					tinyMCE.execCommand('mceRemoveControl',false,id);
      				}
      			});
      		}
      		
      		//reset things, so they can be re-init
      		gjWysiwyg.tinyLoaded = false;
      		gjWysiwyg.editors = [];
      	},
      	
      	//This one used to re-load tiny after it has been removed
      	restoreTiny : function () {
      		gjWysiwyg.loadTiny();
      		gjWysiwyg.editors = jQuery('.editor');
      	},
      	
      	toggleTinyEditors : function () {
      		if (gjWysiwyg.loadTiny()) {
      			if (gjWysiwyg.localStorage) {
      				//tiny was loaded for first time, so toggling on
      				localStorage.tinyMCE = 'on';
      				return;
      			}
      		}
      		if (gjWysiwyg.editors) {
      			gjWysiwyg.editors.each(function () {
      				var id = jQuery(this).attr('id');
      				if (!tinyMCE.getInstanceById(id)) {
      					tinyMCE.execCommand('mceAddControl',false,id);
      					if (gjWysiwyg.localStorage) {
      						localStorage.tinyMCE='on';
      					}
      				} else {
      					tinyMCE.execCommand('mceRemoveControl',false,id);
      					if (gjWysiwyg.localStorage) {
      						localStorage.tinyMCE='off';
      					}
      				}
      			});
      		}
      	}
      };

      
      Replace With:

      	},
      	
      	removeTiny : function () {
      		tinyMCE.remove();
      		localStorage.tinyMCE = 'off';
      	},
      	
      	//This one used to re-load tiny after it has been removed
      	restoreTiny : function () {
      		gjWysiwyg.loadTiny();
      	},
      	
      	toggleTinyEditors : function () {
      		if(localStorage.tinyMCE=='on') {
      			gjWysiwyg.removeTiny();
      		} else {
      			gjWysiwyg.restoreTiny();
      		}
      	}
      };

      Near line 1422, make the following changes:

      	},
      	
      	removeTiny : function () {
      		if (!gjWysiwyg.tinyLoaded) {
      			//nothing to do
      			//alert('not loaded, nothing to do!');
      			return;
      		}
      		if (gjWysiwyg.editors) {
      			gjWysiwyg.editors.each(function () {
      				var id = jQuery(this).attr('id');
      				if (tinyMCE.getInstanceById(id)) {
      					tinyMCE.execCommand('mceRemoveControl',false,id);
      				}
      			});
      		}
      		
      		//reset things, so they can be re-init
      		gjWysiwyg.tinyLoaded = false;
      		gjWysiwyg.editors = [];
      		tinyMCE.remove();
      		localStorage.tinyMCE = 'off';
      	},
      	
      	//This one used to re-load tiny after it has been removed
      	restoreTiny : function () {
      		gjWysiwyg.loadTiny();
      		gjWysiwyg.editors = jQuery('.editor');
      	},
      	
      	toggleTinyEditors : function () {
      		if (gjWysiwyg.loadTiny()) {
      			if (gjWysiwyg.localStorage) {
      				//tiny was loaded for first time, so toggling on
      				localStorage.tinyMCE = 'on';
      				return;
      			}
      		}
      		if (gjWysiwyg.editors) {
      			gjWysiwyg.editors.each(function () {
      				var id = jQuery(this).attr('id');
      				if (!tinyMCE.getInstanceById(id)) {
      					tinyMCE.execCommand('mceAddControl',false,id);
      					if (gjWysiwyg.localStorage) {
      						localStorage.tinyMCE='on';
      					}
      				} else {
      					tinyMCE.execCommand('mceRemoveControl',false,id);
      					if (gjWysiwyg.localStorage) {
      						localStorage.tinyMCE='off';
      					}
      				}
      			});
      		if(localStorage.tinyMCE=='on') {
      			gjWysiwyg.removeTiny();
      		} else {
      			gjWysiwyg.restoreTiny();
      		}
      	}
      };

3. In file external/js/plugins/tabs.js
   
   
   Near line 125, FIND:
   

   		if (data.localStoragePersist) {
   			localStorage.setItem(storageName, tabId);
   		}
   	};
   	internal.precheck = function (elem) {
   		if (elem.hasClass('activeTab')) {

   
   Replace With:

   		if (data.localStoragePersist) {
   			localStorage.setItem(storageName, tabId);
   		}
   		
   		//re-do the gallery height calculations for any that were initially hidden (no effect if no galleries present)
   		gjUtil.initGallery();
   	};
   	internal.precheck = function (elem) {
   		if (elem.hasClass('activeTab')) {

   Near line 125, make the following changes:

   		if (data.localStoragePersist) {
   			localStorage.setItem(storageName, tabId);
   		}
   		
   		//re-do the gallery height calculations for any that were initially hidden (no effect if no galleries present)
   		gjUtil.initGallery();
   	};
   	internal.precheck = function (elem) {
   		if (elem.hasClass('activeTab')) {

4. In file main_page/listing_classified.tpl
   
   
   Near line 80, FIND:
   

   	<div class="user-profile-cntnr" id="seller">
   		<div class="member-since-cntnr">
   			{addon author='geo_addons' addon='social_connect' tag='facebook_listing_profile_picture' width=86 assign='fb_pic'}
   			{if $fb_pic}
   				<div class="member-fb">
   					{$fb_pic}
   				</div>
   				<div class="member"><span class="date" style="color: #FFF; text-shadow: 0px 0px 5px #000000">{listing field='member_since'}</span></div>
   			{else}

   
   Replace With:

   	<div class="user-profile-cntnr" id="seller">
   		<div class="member-since-cntnr">
   			{addon author='geo_addons' addon='social_connect' tag='facebook_listing_profile_picture' width=86 assign='fb_pic'}
   			{if $fb_pic or $enabledAddons.profile_pics}
   				<div class="member-fb">
   					{if $fb_pic}{$fb_pic}{else}{listing addon='profile_pics' tag='show_pic'}{/if}
   				</div>
   				<div class="member"><span class="date" style="color: #FFF; text-shadow: 0px 0px 5px #000000">{listing field='member_since'}</span></div>
   			{else}

   Near line 80, make the following changes:

   	<div class="user-profile-cntnr" id="seller">
   		<div class="member-since-cntnr">
   			{addon author='geo_addons' addon='social_connect' tag='facebook_listing_profile_picture' width=86 assign='fb_pic'}
   			{if $fb_pic}
   			{if $fb_pic or $enabledAddons.profile_pics}
   				<div class="member-fb">
   					{$fb_pic}
   					{if $fb_pic}{$fb_pic}{else}{listing addon='profile_pics' tag='show_pic'}{/if}
   				</div>
   				<div class="member"><span class="date" style="color: #FFF; text-shadow: 0px 0px 5px #000000">{listing field='member_since'}</span></div>
   			{else}

5. In file system/auctions/bidding/bid_setup.tpl
   
   
   1. Near line 1, FIND:
      

      {* @git-info@ *}
      
      
      <div class="content_box">
      	<h1 class="title">{$messages.102437}</h1>
      	<h3 class="subtitle">{$title}</h3>

      
      Replace With:

      {* @git-info@ *}
      <div class="content_box">
      	<h1 class="title">{$messages.102437}</h1>
      	<h3 class="subtitle">{$title}</h3>

      Near line 1, make the following changes:

      {* @git-info@ *}
      
      
      <div class="content_box">
      	<h1 class="title">{$messages.102437}</h1>
      	<h3 class="subtitle">{$title}</h3>

   2. Near line 80, FIND:
      

      					<div class="center">
      						<input type="hidden" name="c[bid_amount]" value="{$hidden_price}" />
      						<input type="hidden" name="d" value="1" />
      						<input type="submit" name="c[buy_now_bid]" class="button buy_now_link" value="{if $verify}{$messages.500238}{else}{$messages.102444}{/if}" />
      					</div>
      				{elseif $auction_type == 'dutch'}

      
      Replace With:

      					<div class="center">
      						<input type="hidden" name="c[bid_amount]" value="{$hidden_price}" />
      						<input type="hidden" name="d" value="1" />
      						<div class="addon_bid_extra">{foreach $addon_bid_extra as $addon}{$addon}{/foreach}</div>
      						<input type="submit" name="c[buy_now_bid]" class="button buy_now_link" value="{if $verify}{$messages.500238}{else}{$messages.102444}{/if}" />
      					</div>
      				{elseif $auction_type == 'dutch'}

      Near line 80, make the following changes:

      					<div class="center">
      						<input type="hidden" name="c[bid_amount]" value="{$hidden_price}" />
      						<input type="hidden" name="d" value="1" />
      						<div class="addon_bid_extra">{foreach $addon_bid_extra as $addon}{$addon}{/foreach}</div>
      						<input type="submit" name="c[buy_now_bid]" class="button buy_now_link" value="{if $verify}{$messages.500238}{else}{$messages.102444}{/if}" />
      					</div>
      				{elseif $auction_type == 'dutch'}

   3. Near line 115, FIND:
      

      					
      					<br />
      					<div class="center">
      						<input type="submit" value="{if $verify}{$messages.500241}{else}{$messages.102439}{/if}" class="button" />
      					</div>
      					

      
      Replace With:

      					
      					<br />
      					<div class="center">
      						<div class="addon_bid_extra">{foreach $addon_bid_extra as $addon}{$addon}{/foreach}</div>
      						<input type="submit" value="{if $verify}{$messages.500241}{else}{$messages.102439}{/if}" class="button" />
      					</div>
      					

      Near line 115, make the following changes:

      					
      					<br />
      					<div class="center">
      						<div class="addon_bid_extra">{foreach $addon_bid_extra as $addon}{$addon}{/foreach}</div>
      						<input type="submit" value="{if $verify}{$messages.500241}{else}{$messages.102439}{/if}" class="button" />
      					</div>
      					

   4. Near line 154, FIND:
      

      					
      					<br />
      					<div class="center">
      						<input type="submit" value="{if $verify}{$messages.500991}{else}{$messages.500990}{/if}" class="button buy_now_link" />
      					</div>
      					

      
      Replace With:

      					
      					<br />
      					<div class="center">
      						<div class="addon_bid_extra">{foreach $addon_bid_extra as $addon}{$addon}{/foreach}</div>
      						<input type="submit" value="{if $verify}{$messages.500991}{else}{$messages.500990}{/if}" class="button buy_now_link" />
      					</div>
      					

      Near line 154, make the following changes:

      					
      					<br />
      					<div class="center">
      						<div class="addon_bid_extra">{foreach $addon_bid_extra as $addon}{$addon}{/foreach}</div>
      						<input type="submit" value="{if $verify}{$messages.500991}{else}{$messages.500990}{/if}" class="button buy_now_link" />
      					</div>
      					

   5. Near line 195, FIND:
      

      					</div>
      		
      					<div class="center">
      						<input type="submit" value="{if $verify}{$messages.500236}{else}{$messages.102439}{/if}" class="button buy_now_link" />
      					</div>

      
      Replace With:

      					</div>
      		
      					<div class="center">
      						<div class="addon_bid_extra">{foreach $addon_bid_extra as $addon}{$addon}{/foreach}</div>
      						<input type="submit" value="{if $verify}{$messages.500236}{else}{$messages.102439}{/if}" class="button buy_now_link" />
      					</div>

      Near line 195, make the following changes:

      					</div>
      		
      					<div class="center">
      						<div class="addon_bid_extra">{foreach $addon_bid_extra as $addon}{$addon}{/foreach}</div>
      						<input type="submit" value="{if $verify}{$messages.500236}{else}{$messages.102439}{/if}" class="button buy_now_link" />
      					</div>

6. In file system/classes/HTML/date_select.tpl
   
   
   1. Near line 2, FIND:
      

      
      <div class="date-time-labels">
      
      	<div>	
      		<div>
      			<label>{$labels.month}</label><br /> <select {if $isEnd}id="endtime_month"{/if} name="{$names.month}" class="field date-time">
      			{section name=month start=1 loop=13}
      				<option value="{$smarty.section.month.index}"{if $smarty.section.month.index == $values.month} selected="selected"{/if}>{$smarty.section.month.index}</option>
      			{/section}
      			</select>
      		</div>
      		<div>
      			<label>{$labels.day}</label><br /> <select {if $isEnd}id="endtime_day"{/if} name="{$names.day}" class="field date-time">
      			{section name=day start=1 loop=32}
      				<option value="{$smarty.section.day.index}"{if $smarty.section.day.index == $values.day} selected="selected"{/if}>{$smarty.section.day.index}</option>
      			{/section}
      			</select>
      		</div>
      		<div>	
      			<label>{$labels.year}</label><br /> <select {if $isEnd}id="endtime_year"{/if} name="{$names.year}" class="field date-time">
      			{* $years is the current year plus the next two *} 
      			{foreach from=$years item=year}

      
      Replace With:

      
      <div class="date-time-labels">
      
      	<div {if $in_admin}style='display: inline-block;'{/if}>	
      		<div {if $in_admin}style='display: inline-block;'{/if}>
      			<label>{$labels.month}</label><br /> <select {if $isEnd}id="endtime_month"{/if} name="{$names.month}" class="field date-time">
      			{section name=month start=1 loop=13}
      				<option value="{$smarty.section.month.index}"{if $smarty.section.month.index == $values.month} selected="selected"{/if}>{$smarty.section.month.index}</option>
      			{/section}
      			</select>
      		</div>
      		<div {if $in_admin}style='display: inline-block;'{/if}>
      			<label>{$labels.day}</label><br /> <select {if $isEnd}id="endtime_day"{/if} name="{$names.day}" class="field date-time">
      			{section name=day start=1 loop=32}
      				<option value="{$smarty.section.day.index}"{if $smarty.section.day.index == $values.day} selected="selected"{/if}>{$smarty.section.day.index}</option>
      			{/section}
      			</select>
      		</div>
      		<div {if $in_admin}style='display: inline-block;'{/if}>	
      			<label>{$labels.year}</label><br /> <select {if $isEnd}id="endtime_year"{/if} name="{$names.year}" class="field date-time">
      			{* $years is the current year plus the next two *} 
      			{foreach from=$years item=year}

      Near line 2, make the following changes:

      
      <div class="date-time-labels">
      
      	<div>	
      		<div>
      	<div {if $in_admin}style='display: inline-block;'{/if}>	
      		<div {if $in_admin}style='display: inline-block;'{/if}>
      			<label>{$labels.month}</label><br /> <select {if $isEnd}id="endtime_month"{/if} name="{$names.month}" class="field date-time">
      			{section name=month start=1 loop=13}
      				<option value="{$smarty.section.month.index}"{if $smarty.section.month.index == $values.month} selected="selected"{/if}>{$smarty.section.month.index}</option>
      			{/section}
      			</select>
      		</div>
      		<div>
      		<div {if $in_admin}style='display: inline-block;'{/if}>
      			<label>{$labels.day}</label><br /> <select {if $isEnd}id="endtime_day"{/if} name="{$names.day}" class="field date-time">
      			{section name=day start=1 loop=32}
      				<option value="{$smarty.section.day.index}"{if $smarty.section.day.index == $values.day} selected="selected"{/if}>{$smarty.section.day.index}</option>
      			{/section}
      			</select>
      		</div>
      		<div>	
      		<div {if $in_admin}style='display: inline-block;'{/if}>	
      			<label>{$labels.year}</label><br /> <select {if $isEnd}id="endtime_year"{/if} name="{$names.year}" class="field date-time">
      			{* $years is the current year plus the next two *} 
      			{foreach from=$years item=year}

   2. Near line 30, FIND:
      

      {* separate the date and time with a bunch of non-breaking spaces *}
      {section name=spacer start=0 loop=11} {/section}
      
      	<div>
      		<div>
      			<label>{$labels.hour}</label><br /> <select {if $isEnd}id="endtime_hour"{/if} name="{$names.hour}" class="field date-time">
      			{section name=hour start=0 loop=24}
      				<option value="{$smarty.section.hour.index}"{if $smarty.section.hour.index == $values.hour} selected="selected"{/if}>{$smarty.section.hour.index|string_format:"%02d"}</option>

      
      Replace With:

      {* separate the date and time with a bunch of non-breaking spaces *}
      {section name=spacer start=0 loop=11} {/section}
      
      	<div {if $in_admin}style='display: inline-block;'{/if}>
      		<div {if $in_admin}style='display: inline-block;'{/if}>
      			<label>{$labels.hour}</label><br /> <select {if $isEnd}id="endtime_hour"{/if} name="{$names.hour}" class="field date-time">
      			{section name=hour start=0 loop=24}
      				<option value="{$smarty.section.hour.index}"{if $smarty.section.hour.index == $values.hour} selected="selected"{/if}>{$smarty.section.hour.index|string_format:"%02d"}</option>

      Near line 30, make the following changes:

      {* separate the date and time with a bunch of non-breaking spaces *}
      {section name=spacer start=0 loop=11} {/section}
      
      	<div>
      		<div>
      	<div {if $in_admin}style='display: inline-block;'{/if}>
      		<div {if $in_admin}style='display: inline-block;'{/if}>
      			<label>{$labels.hour}</label><br /> <select {if $isEnd}id="endtime_hour"{/if} name="{$names.hour}" class="field date-time">
      			{section name=hour start=0 loop=24}
      				<option value="{$smarty.section.hour.index}"{if $smarty.section.hour.index == $values.hour} selected="selected"{/if}>{$smarty.section.hour.index|string_format:"%02d"}</option>

   3. Near line 39, FIND:
      

      			</select>
      		</div>
      
      		<div>		
      			<label>{$labels.minute}</label><br /> <select {if $isEnd}id="endtime_minute"{/if} name="{$names.minute}" class="field date-time">
      			{section name=minute start=0 loop=60}
      				<option value="{$smarty.section.minute.index}"{if $smarty.section.minute.index == $values.minute} selected="selected"{/if}>{$smarty.section.minute.index}</option>

      
      Replace With:

      			</select>
      		</div>
      
      		<div {if $in_admin}style='display: inline-block;'{/if}>		
      			<label>{$labels.minute}</label><br /> <select {if $isEnd}id="endtime_minute"{/if} name="{$names.minute}" class="field date-time">
      			{section name=minute start=0 loop=60}
      				<option value="{$smarty.section.minute.index}"{if $smarty.section.minute.index == $values.minute} selected="selected"{/if}>{$smarty.section.minute.index}</option>

      Near line 39, make the following changes:

      			</select>
      		</div>
      
      		<div>		
      		<div {if $in_admin}style='display: inline-block;'{/if}>		
      			<label>{$labels.minute}</label><br /> <select {if $isEnd}id="endtime_minute"{/if} name="{$names.minute}" class="field date-time">
      			{section name=minute start=0 loop=60}
      				<option value="{$smarty.section.minute.index}"{if $smarty.section.minute.index == $values.minute} selected="selected"{/if}>{$smarty.section.minute.index}</option>

7. In file system/invoices/common/invoice_body.tpl
   
   
   1. Near line 6, FIND:
      

      	{else}
      		<h1 class="title">Invoice</h1>
      	{/if}
      	<p class="page_instructions">{$messages.3175}</p>
      {/if}
      
      <div class="{if $in_admin && !$print}printBox_lightbox{elseif !$in_admin && !$print}printBox{else}printBox_printFriendly{/if}">

      
      Replace With:

      	{else}
      		<h1 class="title">Invoice</h1>
      	{/if}
      {/if}
      
      <div class="{if $in_admin && !$print}printBox_lightbox{elseif !$in_admin && !$print}printBox{else}printBox_printFriendly{/if}">

      Near line 6, make the following changes:

      	{else}
      		<h1 class="title">Invoice</h1>
      	{/if}
      	<p class="page_instructions">{$messages.3175}</p>
      {/if}
      
      <div class="{if $in_admin && !$print}printBox_lightbox{elseif !$in_admin && !$print}printBox{else}printBox_printFriendly{/if}">

   2. Near line 26, FIND:
      

      	<div class="invoice_shell">
      		<a href="index.php" id="header_logo"> </a>
      		<div class="clear"></div>
      	
      		<!-- START RIGHT COLUMN -->
      		<div class="invoice_right_column">

      
      Replace With:

      	<div class="invoice_shell">
      		<a href="index.php" id="header_logo"> </a>
      		<div class="clear"></div>
      		
      		<div class='invoice_title'>{$messages.502445}</div>
      	
      		<!-- START RIGHT COLUMN -->
      		<div class="invoice_right_column">

      Near line 26, make the following changes:

      	<div class="invoice_shell">
      		<a href="index.php" id="header_logo"> </a>
      		<div class="clear"></div>
      		
      		<div class='invoice_title'>{$messages.502445}</div>
      	
      		<!-- START RIGHT COLUMN -->
      		<div class="invoice_right_column">

   3. Near line 59, FIND:
      

      	
      		<!-- START LEFT COLUMN -->
      		<div class="invoice_left_column">
      			<h3 class="invoice_label">{$messages.500518}</h3>
      			<div class="invoice_box">
      				<div class="invoice_row_odd">
      					{$invoice.company_address}
      				</div>
      			</div>
      			<br />
      			<h3 class="invoice_label">{$messages.500519}</h3>
      			<div class="invoice_box">
      				<div class="invoice_row_even">
      					{if $invoice.client.firstname OR $invoice.client.lastname}

      
      Replace With:

      	
      		<!-- START LEFT COLUMN -->
      		<div class="invoice_left_column">
      			<div class="invoice_label">{$messages.500518}</div>
      			<div class="invoice_box">
      				<div class="invoice_row_odd">
      					<strong>{$site_name}</strong><br />
      					{$invoice.company_address}
      				</div>
      			</div>
      
      			<div class="invoice_label">{$messages.500519}</div>
      			<div class="invoice_box">
      				<div class="invoice_row_even">
      					{if $invoice.client.firstname OR $invoice.client.lastname}

      Near line 59, make the following changes:

      	
      		<!-- START LEFT COLUMN -->
      		<div class="invoice_left_column">
      			<h3 class="invoice_label">{$messages.500518}</h3>
      			<div class="invoice_label">{$messages.500518}</div>
      			<div class="invoice_box">
      				<div class="invoice_row_odd">
      					<strong>{$site_name}</strong><br />
      					{$invoice.company_address}
      				</div>
      			</div>
      			<br />
      			<h3 class="invoice_label">{$messages.500519}</h3>
      
      			<div class="invoice_label">{$messages.500519}</div>
      			<div class="invoice_box">
      				<div class="invoice_row_even">
      					{if $invoice.client.firstname OR $invoice.client.lastname}

   4. Near line 100, FIND:
      

      			</div>
      		</div>
      		<!-- END LEFT COLUMN -->
      		<h3 class="invoice_label">{$messages.3178}</h3>
      		<div class="invoice_box">
      			<table>
      				<thead>

      
      Replace With:

      			</div>
      		</div>
      		<!-- END LEFT COLUMN -->
      		<div class="invoice_label">{$messages.3178}</div>
      		<div class="invoice_box">
      			<table>
      				<thead>

      Near line 100, make the following changes:

      			</div>
      		</div>
      		<!-- END LEFT COLUMN -->
      		<h3 class="invoice_label">{$messages.3178}</h3>
      		<div class="invoice_label">{$messages.3178}</div>
      		<div class="invoice_box">
      			<table>
      				<thead>

   5. Near line 147, FIND:
      

      	
      		<div class="invoice_total">
      			<div class="invoice_box">
      				<div class="invoice_row_odd">
      					<strong class="right amount_{if $invoice.invoice_amount > 0}paid{elseif $invoice.invoice_amount < 0}due{else}zero{/if}">{$invoice.invoice_amount|displayPrice}</strong>
      					<strong>{$messages.3177}</strong>
      				</div>

      
      Replace With:

      	
      		<div class="invoice_total">
      			<div class="invoice_box">
      				<div class="invoice_row_title">
      					<strong class="right amount_{if $invoice.invoice_amount > 0}paid{elseif $invoice.invoice_amount < 0}due{else}zero{/if}">{$invoice.invoice_amount|displayPrice}</strong>
      					<strong>{$messages.3177}</strong>
      				</div>

      Near line 147, make the following changes:

      	
      		<div class="invoice_total">
      			<div class="invoice_box">
      				<div class="invoice_row_odd">
      				<div class="invoice_row_title">
      					<strong class="right amount_{if $invoice.invoice_amount > 0}paid{elseif $invoice.invoice_amount < 0}due{else}zero{/if}">{$invoice.invoice_amount|displayPrice}</strong>
      					<strong>{$messages.3177}</strong>
      				</div>

8. In file system/order_items/shared/listing_collect_details.tpl
   
   
   Near line 115, FIND:
   

   					{$session_variables.price|displayPrice:$session_variables.precurrency:$session_variables.postcurrency}
   				{/if}
   				{if $error_msgs.price}
   					<span class="error_message">{$messages.642}</span>
   				{/if}
   			</div>
   		{/if}

   
   Replace With:

   					{$session_variables.price|displayPrice:$session_variables.precurrency:$session_variables.postcurrency}
   				{/if}
   				{if $error_msgs.price}
   					{if $error_msgs.price_minimum}
   						<span class="error_message">{$messages.502440}</span>
   					{else}
   						<span class="error_message">{$messages.642}</span>
   					{/if}
   				{/if}
   			</div>
   		{/if}

   Near line 115, make the following changes:

   					{$session_variables.price|displayPrice:$session_variables.precurrency:$session_variables.postcurrency}
   				{/if}
   				{if $error_msgs.price}
   					<span class="error_message">{$messages.642}</span>
   					{if $error_msgs.price_minimum}
   						<span class="error_message">{$messages.502440}</span>
   					{else}
   						<span class="error_message">{$messages.642}</span>
   					{/if}
   				{/if}
   			</div>
   		{/if}

9. New file added: system/payment_gateways/stripe/payment_details.cc_form.tpl
10. In file system/search_class/details_form.tpl
    
    
    1. Near line 50, FIND:
       

       				</div>
       			{/if}
       			</div>
       			{if $show_close_24_hours}
       				<div style="text-align:center; margin: 5px auto 10px auto; font-size: 0.8em;">
       					<label><input type='checkbox' id='ending_today' name='b[ending_today]' />&nbsp;{$messages.500079}</label>
       				</div>
       			{/if}
       					
       			{if $messages.1442}
       				<h3 class="subtitle">{$messages.1442}</h3>

       
       Replace With:

       				</div>
       			{/if}
       			</div>
       			{if $show_close_24_hours and not ($queryFields.auction_time_left or $queryFields.classified_time_left)}
       				<div style="text-align:center; margin: 5px auto 10px auto; font-size: 0.8em;">
       					<label><input type='checkbox' id='ending_today' name='b[ending_today]' />&nbsp;{$messages.500079}</label>
       				</div>
       			{/if}
       			{if $queryFields.auction_start or $queryFields.classified_start}
       				<div style="text-align:center; margin: 5px auto 10px auto; font-size: 0.8em;">
       					<label>{$messages.502441} <select class="field" name="b[start_date]">
       						<option value="0">{$messages.502443}</option>
       						<option value="1">1</option>
       						<option value="2">2</option>
       						<option value="7">7</option>
       						<option value="14">14</option>
       						<option value="30">30</option>
       					</select> {$messages.502442}</label>
       				</div>
       			{/if}
       			{if $queryFields.auction_time_left or $queryFields.classified_time_left}
       				<div style="text-align:center; margin: 5px auto 10px auto; font-size: 0.8em;">
       					<label>{$messages.502444} <select class="field" name="b[end_date]">
       						<option value="0">{$messages.502443}</option>
       						<option value="1">1</option>
       						<option value="2">2</option>
       						<option value="3">3</option>
       					</select> {$messages.502442}</label>
       				</div>
       			{/if}
       					
       			{if $messages.1442}
       				<h3 class="subtitle">{$messages.1442}</h3>

       Near line 50, make the following changes:

       				</div>
       			{/if}
       			</div>
       			{if $show_close_24_hours}
       			{if $show_close_24_hours and not ($queryFields.auction_time_left or $queryFields.classified_time_left)}
       				<div style="text-align:center; margin: 5px auto 10px auto; font-size: 0.8em;">
       					<label><input type='checkbox' id='ending_today' name='b[ending_today]' />&nbsp;{$messages.500079}</label>
       				</div>
       			{/if}
       			{if $queryFields.auction_start or $queryFields.classified_start}
       				<div style="text-align:center; margin: 5px auto 10px auto; font-size: 0.8em;">
       					<label>{$messages.502441} <select class="field" name="b[start_date]">
       						<option value="0">{$messages.502443}</option>
       						<option value="1">1</option>
       						<option value="2">2</option>
       						<option value="7">7</option>
       						<option value="14">14</option>
       						<option value="30">30</option>
       					</select> {$messages.502442}</label>
       				</div>
       			{/if}
       			{if $queryFields.auction_time_left or $queryFields.classified_time_left}
       				<div style="text-align:center; margin: 5px auto 10px auto; font-size: 0.8em;">
       					<label>{$messages.502444} <select class="field" name="b[end_date]">
       						<option value="0">{$messages.502443}</option>
       						<option value="1">1</option>
       						<option value="2">2</option>
       						<option value="3">3</option>
       					</select> {$messages.502442}</label>
       				</div>
       			{/if}
       					
       			{if $messages.1442}
       				<h3 class="subtitle">{$messages.1442}</h3>

    2. Near line 68, FIND:
       

       					{foreach $cats.levels as $info}
       						{include file='../order_items/shared/leveled_fields/level.tpl'}
       					{/foreach}
       					<input type='hidden' name='b[subcategories_also]' value='1' />
       					{* to support legacy opt field scripts against new leveled category selector, use a hidden input: *}
       					<input type='hidden' id='adv_searchCat' value='0' name='c' />

       
       Replace With:

       					{foreach $cats.levels as $info}
       						{include file='../order_items/shared/leveled_fields/level.tpl'}
       					{/foreach}
       					{$leveledCatSearch=false} {* make sure this doesn't bleed over into other leveled field thingys *}
       					<input type='hidden' name='b[subcategories_also]' value='1' />
       					{* to support legacy opt field scripts against new leveled category selector, use a hidden input: *}
       					<input type='hidden' id='adv_searchCat' value='0' name='c' />

       Near line 68, make the following changes:

       					{foreach $cats.levels as $info}
       						{include file='../order_items/shared/leveled_fields/level.tpl'}
       					{/foreach}
       					{$leveledCatSearch=false} {* make sure this doesn't bleed over into other leveled field thingys *}
       					<input type='hidden' name='b[subcategories_also]' value='1' />
       					{* to support legacy opt field scripts against new leveled category selector, use a hidden input: *}
       					<input type='hidden' id='adv_searchCat' value='0' name='c' />

11. In file system/tinymce.tpl
    
    
    Near line 1, FIND:
    

    {* @git-info@ *}
    
    <!-- tinyMCE -->
    {if $use_gzip}
    <script type="text/javascript">
    	//<![CDATA[
    	tinyMCE_GZ.init({
    		themes : 'advanced',
    		languages : 'en',
    		disk_cache : true, //breaks load/unload to turn this on
    		debug : false
    	});
    	//]]>
    </script>
    {/if}
    
    <script type="text/javascript">
    	//<![CDATA[
    	
    	gjWysiwyg.loadTiny = function () {
    		if (gjWysiwyg.tinyLoaded) {
    			return false;
    		}
    		gjWysiwyg.tinyLoaded = true;
    		gjWysiwyg.localStorage = (typeof(Storage)!=='undefined');
    		
    		tinyMCE.init({
    			theme : 'advanced',
    			language : 'en',
    			mode : 'textareas',
    			plugins: 'advlink',//fix link to work in gzip
    			editor_selector : 'editor',
    			{if $blank_screen_fix}strict_loading_mode : true,{/if}
    			theme_advanced_disable : 'visualaid,help,styleselect,cleanup,image',
    			theme_advanced_buttons3_add : 'separator,forecolor,backcolor',
    			extended_valid_elements : "iframe[src|width|height|name|align|style|scrolling|frameborder|allowtransparency]",
    			//make it NOT automatically add the <p> around everything...  Comment the line out if it is needed.
    			forced_root_block : '',
    			
    			content_css: '{if $inAdmin}../{/if}{external file="css/wysiwyg.css"}'
    		});
    		
    		{if $inAdmin}
    			gjWysiwyg.editors = jQuery('.editor');
    		{/if}
    		
    		return true;
    	};
    	
    	{if !$inAdmin}
    		//when page is loaded, init the editor
    		jQuery(function () {
    			gjWysiwyg.localStorage = (typeof(Storage)!=='undefined');
    			if (!gjWysiwyg.localStorage || localStorage.tinyMCE!='off') {
    				gjWysiwyg.loadTiny();
    			}
    			
    			gjWysiwyg.editors = jQuery('.editor');
    		});
    	{/if}
    	//]]>
    </script>
    <!-- tinyMCE end -->

    
    Replace With:

    {* @git-info@ *}
    
    <script type="text/javascript">
    	//<![CDATA[
    	
    	gjWysiwyg.loadTiny = function () {
    		
    		
    		tinyMCE.init({
    			selector : '.editor',
    			extended_valid_elements : "iframe[src|width|height|name|align|style|scrolling|frameborder|allowtransparency]",
    			//make it NOT automatically add the <p> around everything...  Comment the line out if it is needed.
    			forced_root_block : '',
    			
    			content_css: '{if $inAdmin}../{/if}{external file="css/wysiwyg.css"}',
    			plugins: 'lists,link,paste,table,insertdatetime,code,preview,media,searchreplace,print,contextmenu,directionality,fullscreen,noneditable,visualchars,nonbreaking,emoticons,anchor,textcolor,colorpicker,charmap,searchreplace,hr',
    			toolbar: [
    			'undo redo | cut copy paste | formatselect fontsizeselect',
    			'bold italic underline strikethrough subscript superscript removeformat | alignleft aligncenter alignright alignjustify | outdent indent blockquote',
    			'bullist numlist | link charmap hr emoticons | forecolor backcolor'
    			],
    			menubar: false,
    			statusbar: false
    		});
    			
    		localStorage.tinyMCE = 'on';	
    		return true;
    	};
    	
    	{if !$inAdmin}
    		//when page is loaded, init the editor
    		jQuery(function () {
    			
    			if (localStorage.tinyMCE.length == 0 || localStorage.tinyMCE == 'on') {
    				gjWysiwyg.loadTiny();
    			}
    			
    		});
    	{/if}
    	//]]>
    </script>

    Near line 1, make the following changes:

    {* @git-info@ *}
    
    <!-- tinyMCE -->
    {if $use_gzip}
    <script type="text/javascript">
    	//<![CDATA[
    	tinyMCE_GZ.init({
    		themes : 'advanced',
    		languages : 'en',
    		disk_cache : true, //breaks load/unload to turn this on
    		debug : false
    	});
    	//]]>
    </script>
    {/if}
    
    <script type="text/javascript">
    	//<![CDATA[
    	
    	gjWysiwyg.loadTiny = function () {
    		if (gjWysiwyg.tinyLoaded) {
    			return false;
    		}
    		gjWysiwyg.tinyLoaded = true;
    		gjWysiwyg.localStorage = (typeof(Storage)!=='undefined');
    		
    		
    		tinyMCE.init({
    			theme : 'advanced',
    			language : 'en',
    			mode : 'textareas',
    			plugins: 'advlink',//fix link to work in gzip
    			editor_selector : 'editor',
    			{if $blank_screen_fix}strict_loading_mode : true,{/if}
    			theme_advanced_disable : 'visualaid,help,styleselect,cleanup,image',
    			theme_advanced_buttons3_add : 'separator,forecolor,backcolor',
    			selector : '.editor',
    			extended_valid_elements : "iframe[src|width|height|name|align|style|scrolling|frameborder|allowtransparency]",
    			//make it NOT automatically add the <p> around everything...  Comment the line out if it is needed.
    			forced_root_block : '',
    			
    			content_css: '{if $inAdmin}../{/if}{external file="css/wysiwyg.css"}'
    			content_css: '{if $inAdmin}../{/if}{external file="css/wysiwyg.css"}',
    			plugins: 'lists,link,paste,table,insertdatetime,code,preview,media,searchreplace,print,contextmenu,directionality,fullscreen,noneditable,visualchars,nonbreaking,emoticons,anchor,textcolor,colorpicker,charmap,searchreplace,hr',
    			toolbar: [
    			'undo redo | cut copy paste | formatselect fontsizeselect',
    			'bold italic underline strikethrough subscript superscript removeformat | alignleft aligncenter alignright alignjustify | outdent indent blockquote',
    			'bullist numlist | link charmap hr emoticons | forecolor backcolor'
    			],
    			menubar: false,
    			statusbar: false
    		});
    		
    		{if $inAdmin}
    			gjWysiwyg.editors = jQuery('.editor');
    		{/if}
    		
    			
    		localStorage.tinyMCE = 'on';	
    		return true;
    	};
    	
    	{if !$inAdmin}
    		//when page is loaded, init the editor
    		jQuery(function () {
    			gjWysiwyg.localStorage = (typeof(Storage)!=='undefined');
    			if (!gjWysiwyg.localStorage || localStorage.tinyMCE!='off') {
    			
    			if (localStorage.tinyMCE.length == 0 || localStorage.tinyMCE == 'on') {
    				gjWysiwyg.loadTiny();
    			}
    			
    			gjWysiwyg.editors = jQuery('.editor');
    		});
    	{/if}
    	//]]>
    </script>
    <!-- tinyMCE end -->

12. In file system/user_management/home/my_account_home.tpl
    
    
    Near line 1, FIND:
    

    {* @git-info@ *}
    
    <div class="content_box">
    	<h1 class="title my_account">{$messages.500793}</h1>
    </div>
    
    {counter print=false start=0 assign=box_count}

    
    Replace With:

    {* @git-info@ *}
    
    <div class="content_box">
    	<h1 class="title my_account">
    		{if $enabledAddons.profile_pics}
    			<a href="{$classifieds_url}?a=4&amp;b=3">{addon author='geo_addons' addon='profile_pics' tag='show_pic' height="43"}</a>
    		{/if}
    		{$messages.500793}
    	</h1>
    </div>
    
    {counter print=false start=0 assign=box_count}

    Near line 1, make the following changes:

    {* @git-info@ *}
    
    <div class="content_box">
    	<h1 class="title my_account">{$messages.500793}</h1>
    	<h1 class="title my_account">
    		{if $enabledAddons.profile_pics}
    			<a href="{$classifieds_url}?a=4&amp;b=3">{addon author='geo_addons' addon='profile_pics' tag='show_pic' height="43"}</a>
    		{/if}
    		{$messages.500793}
    	</h1>
    </div>
    
    {counter print=false start=0 assign=box_count}

13. In file system/user_management/information/edit_user_form.tpl
    
    
    1. Near line 1, FIND:
       

       {* @git-info@ *}
       
       <div class="content_box">
       	<h1 class="title my_account">{$messages.636}</h1>
       	<h3 class="subtitle">{$messages.514}</h3>
       	<p class="page_instructions">{$messages.515}</p>
       	
       	<form action="{$formTarget}" autocomplete="off" method="post">
       		<div class="{cycle values='row_odd,row_even'}">
       			<label class="field_label">{$messages.516}</label>
       			{$show->USERNAME}
       		</div>
       		{if $requirePass}
       			<div class="{if $error.currentP}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="required">{$messages.500233} *</label>
       				<input type="password" name="c[currentP]" class="field" />
       				{if $error.currentP}<br /><span class="error_message">{$error.currentP}</span>{/if}
       			</div>
       		{/if}
       	
       		{if $canEditPassword}
       			<div class="{if $error.password}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="field_label">{$messages.517}</label>
       				<input type="password" name="c[password]" class="field" />
       				{if $error.password}<br /><span class="error_message">{$error.password}</span>{/if}
       			</div>
       			<div class="{cycle values='row_odd,row_even'}">
       				<label class="field_label">{$messages.518}</label>
       				<input type="password" name="c[password_verify]" class="field" />
       			</div>
       		{elseif $demo}
       			<div class="field_error_row">This user's password may not be edited in the demo.</div>
       		{/if}
       		
       		<div class="{if $error.email}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       			<label class="required">{$messages.519} *</label>
       			<input type="text" name="c[email]" class="field" value="{$info.email}" /> 
       			{if $showCheckboxes}
       				<input type="checkbox" name="c[apply_to_all_email]" value="1" />{$messages.500109}
       				<input type="checkbox" name="d[expose_email]" value="1"{if $show->EXPOSE_EMAIL} checked="checked"{/if} />{$messages.1574}
       			{/if}
       			{if $error.email}<br /><span class="error_message">{$error.email}</span>{/if}
       		</div>
       			
       		
       		{if $rc->USE_REGISTRATION_COMPANY_NAME_FIELD}
       			<div class="{if $error.company_name}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_COMPANY_NAME_FIELD}required{else}field_label{/if}">{$messages.520}{if $rc->REQUIRE_REGISTRATION_COMPANY_NAME_FIELD} *{/if}</label>
       				<input type="text" name="c[company_name]" class="field" value="{$info.company_name|fromDB}" {if $rc->COMPANY_NAME_MAXLENGTH}maxlength="{$rc->COMPANY_NAME_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_company_name]" value="1"{if $show->EXPOSE_COMPANY_NAME} checked="checked"{/if} />{$messages.1574}{/if}
       				{if $error.company_name}<br /><span class="error_message">{$error.company_name}</span>{/if}
       			</div>
       		{/if}
       		{if $rc->USE_REGISTRATION_BUSINESS_TYPE_FIELD}
       			<div class="{cycle values='row_odd,row_even'}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_BUSINESS_TYPE_FIELD}required{else}field_label{/if}">{$messages.521}{if $rc->REQUIRE_REGISTRATION_BUSINESS_TYPE_FIELD} *{/if}</label>
       				<input type="radio" name="c[business_type]" value="1"{if $show->BUSINESS_TYPE == 1} checked="checked" {/if}/> {$messages.1572}
       				<input type="radio" name="c[business_type]" value="2"{if $show->BUSINESS_TYPE == 2} checked="checked" {/if}/> {$messages.1571}
       			</div>
       		{/if}
       		{if $rc->USE_REGISTRATION_FIRSTNAME_FIELD}
       			<div class="{if $error.firstname}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_FIRSTNAME_FIELD}required{else}field_label{/if}">{$messages.522}{if $rc->REQUIRE_REGISTRATION_FIRSTNAME_FIELD} *{/if}</label>
       				<input type="text" name="c[firstname]" class="field" value="{$info.firstname|fromDB}" {if $rc->FIRSTNAME_MAXLENGTH}maxlength="{$rc->FIRSTNAME_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_firstname]" value="1"{if $show->EXPOSE_FIRSTNAME} checked="checked"{/if} /> {$messages.1574}{/if}
       				{if $error.firstname}<br /><span class="error_message">{$error.firstname}</span>{/if}
       			</div>
       		{/if}
       			
       		{if $rc->USE_REGISTRATION_LASTNAME_FIELD}
       			<div class="{if $error.lastname}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_LASTNAME_FIELD}required{else}field_label{/if}">{$messages.523}{if $rc->REQUIRE_REGISTRATION_LASTNAME_FIELD} *{/if}</label>
       				<input type="text" name="c[lastname]" class="field" value="{$info.lastname|fromDB}" {if $rc->LASTNAME_MAXLENGTH}maxlength="{$rc->LASTNAME_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_lastname]" value="1"{if $show->EXPOSE_LASTNAME} checked="checked"{/if} /> {$messages.1574}{/if}
       				{if $error.lastname}<br /><span class="error_message">{$error.lastname}</span>{/if}
       			</div>
       		{/if}
       	
       		{if $rc->USE_REGISTRATION_ADDRESS_FIELD}
       			<div class="{if $error.address}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_ADDRESS_FIELD}required{else}field_label{/if}">{$messages.524}{if $rc->REQUIRE_REGISTRATION_ADDRESS_FIELD} *{/if}</label>
       				<input type="text" name="c[address]" class="field" value="{$info.address|fromDB}" {if $rc->ADDRESS_MAXLENGTH}maxlength="{$rc->ADDRESS_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_address]" value="1"{if $show->EXPOSE_ADDRESS} checked="checked"{/if} /> {$messages.1574}{/if}
       				{if $error.address}<br /><span class="error_message">{$error.address}</span>{/if}
       			</div>
       		{/if}
       		{if $rc->USE_REGISTRATION_ADDRESS2_FIELD}
       			<div class="{if $error.address_2}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_ADDRESS2_FIELD}required{else}field_label{/if}">{$messages.525}{if $rc->REQUIRE_REGISTRATION_ADDRESS2_FIELD} *{/if}</label>
       				<input type="text" name="c[address_2]" class="field" value="{$info.address_2|fromDB}" {if $rc->ADDRESS_2_MAXLENGTH}maxlength="{$rc->ADDRESS_2_MAXLENGTH}"{/if} />
       				{if $error.address_2}<br /><span class="error_message">{$error.address_2}</span>{/if}
       			</div>
       		{/if}
       		
       		{if $regionSelector}
       			<div class="{if $error.location}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				{$regionSelector}
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_city]" value="1"{if $show->EXPOSE_CITY || $show->EXPOSE_COUNTRY || $show->EXPOSE_STATE} checked="checked"{/if} /> {$messages.1574}{/if}
       				{if $error.location}<br /><span class="error_message">{$error.location}</span>{/if}
       			</div>
       		{/if}
       		
       		{if $rc->USE_REGISTRATION_CITY_FIELD && !$regionOverrides.city}
       			<div class="{if $error.city}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_CITY_FIELD}required{else}field_label{/if}">{$messages.526}{if $rc->REQUIRE_REGISTRATION_CITY_FIELD} *{/if}</label>
       				<input type="text" name="c[city]" class="field" value="{$info.city|fromDB}" {if $rc->CITY_MAXLENGTH}maxlength="{$rc->CITY_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_city]" value="1"{if $show->EXPOSE_CITY} checked="checked"{/if} /> {$messages.1574}{/if}
       				{if $error.city}<br /><span class="error_message">{$error.city}</span>{/if}
       			</div>
       		{/if}
       		
       		{if $rc->USE_REGISTRATION_ZIP_FIELD}
       			<div class="{if $error.zip}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_ZIP_FIELD}required{else}field_label{/if}">{$messages.528}{if $rc->REQUIRE_REGISTRATION_ZIP_FIELD} *{/if}</label>
       				<input type="text" name="c[zip]" class="field" value="{$info.zip|fromDB}" {if $rc->ZIP_MAXLENGTH}maxlength="{$rc->ZIP_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_zip]" value="1"{if $show->EXPOSE_ZIP} checked="checked"{/if} /> {$messages.1574}{/if}
       				{if $error.zip}<br /><span class="error_message">{$error.zip}</span>{/if}
       			</div>
       		{/if}
       		{if $rc->USE_REGISTRATION_PHONE_FIELD}
       			<div class="{if $error.phone}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_PHONE_FIELD}required{else}field_label{/if}">{$messages.530}{if $rc->REQUIRE_REGISTRATION_PHONE_FIELD} *{/if}</label>
       				<input type="text" name="c[phone]" class="field" value="{$info.phone|fromDB}" {if $rc->PHONE_MAXLENGTH}maxlength="{$rc->PHONE_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_phone]" value="1"{if $show->EXPOSE_PHONE} checked="checked"{/if} /> {$messages.1574}{/if}
       				{if $error.phone}<br /><span class="error_message">{$error.phone}</span>{/if}
       			</div>
       		{/if}
       		{if $rc->USE_REGISTRATION_PHONE2_FIELD}
       			<div class="{if $error.phone2}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_PHONE2_FIELD}required{else}field_label{/if}">{$messages.531}{if $rc->REQUIRE_REGISTRATION_PHONE2_FIELD} *{/if}</label>
       				<input type="text" name="c[phone2]" class="field" value="{$info.phone2|fromDB}" {if $rc->PHONE_2_MAXLENGTH}maxlength="{$rc->PHONE_2_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_phone2]" value="1"{if $show->EXPOSE_PHONE2} checked="checked"{/if} /> {$messages.1574}{/if}
       				{if $error.phone2}<br /><span class="error_message">{$error.phone2}</span>{/if}
       			</div>
       		{/if}
       		{if $rc->USE_REGISTRATION_FAX_FIELD}
       			<div class="{if $error.fax}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_FAX_FIELD}required{else}field_label{/if}">{$messages.532}{if $rc->REQUIRE_REGISTRATION_FAX_FIELD} *{/if}</label>
       				<input type="text" name="c[fax]" class="field" value="{$info.fax|fromDB}" {if $rc->FAX_MAXLENGTH}maxlength="{$rc->FAX_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_fax]" value="1"{if $show->EXPOSE_FAX} checked="checked"{/if} /> {$messages.1574}{/if}
       				{if $error.fax}<br /><span class="error_message">{$error.fax}</span>{/if}
       			</div>
       		{/if}
       		{if $rc->USE_REGISTRATION_URL_FIELD}
       			<div class="{if $error.url}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_URL_FIELD}required{else}field_label{/if}">{$messages.533}{if $rc->REQUIRE_REGISTRATION_URL_FIELD} *{/if}</label>
       				<input type="text" name="c[url]" class="field" value="{$info.url|fromDB}" {if $rc->URL_MAXLENGTH}maxlength="{$rc->URL_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_url]" value="1"{if $show->EXPOSE_URL} checked="checked"{/if} />{$messages.1574}{/if}
       				{if $error.url}<br /><span class="error_message">{$error.url}</span>{/if}
       			</div>
       		{/if}
       		{if count($orderItemFields) > 0}
       			{foreach $orderItemFields as $f}
       				<div class="{if $f.error}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					{if $f.type == 'single_checkbox'}
       						<input type="hidden" value="0" name="{$f.name}" />
       						<input type="checkbox" value="1" name="{$f.name}" {if $f.checked}checked="checked"{/if} /> {$f.value}
       					{else}
       						<label class="{if $f.required}required{else}field_label{/if}">{$f.label}{if $f.required} *{/if}</label>
       						{$f.value}
       					{/if}
       					{if $f.error}
       						<br /><span class="error_message">{$f.error}</span>
       					{/if}
       				</div>
       			{/foreach}
       		{/if}
       		{if count($addonFields) > 0}
       			{foreach $addonFields as $addon => $addonField}
       				{foreach $addonField as $f}
       					<div class="{if $f.error}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       						{if $f.type == 'single_checkbox'}
       							<input type="hidden" value="0" name="{$f.name}" />
       							<label><input type="checkbox" value="1" name="{$f.name}" {if $f.checked}checked="checked"{/if} /> {$f.value}</label>
       						{else}
       							<label class="{if $f.required}required{else}field_label{/if}">{$f.label}{if $f.required} *{/if}</label>
       							{$f.value}

       
       Replace With:

       {* @git-info@ *}
       {if $errorAdminUser}
       	<div class="field_error_box">For security reasons, the admin user's info may not be edited here.</div>
       {else}
       	<div class="content_box">
       		<h1 class="title my_account">{$messages.636}</h1>
       		<h3 class="subtitle">{$messages.514}</h3>
       		<p class="page_instructions">{$messages.515}</p>
       		
       		<form action="{$formTarget}" autocomplete="off" method="post">
       			<div class="{cycle values='row_odd,row_even'}">
       				<label class="field_label">{$messages.516}</label>
       				{$show->USERNAME}
       			</div>
       			{if $requirePass}
       				<div class="{if $error.currentP}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="required">{$messages.500233} *</label>
       					<input type="password" name="c[currentP]" class="field" />
       					{if $error.currentP}<br /><span class="error_message">{$error.currentP}</span>{/if}
       				</div>
       			{/if}
       		
       			{if $canEditPassword}
       				<div class="{if $error.password}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="field_label">{$messages.517}</label>
       					<input type="password" name="c[password]" class="field" />
       					{if $error.password}<br /><span class="error_message">{$error.password}</span>{/if}
       				</div>
       				<div class="{cycle values='row_odd,row_even'}">
       					<label class="field_label">{$messages.518}</label>
       					<input type="password" name="c[password_verify]" class="field" />
       				</div>
       			{elseif $demo}
       				<div class="field_error_row">This user's password may not be edited in the demo.</div>
       			{/if}
       			
       			<div class="{if $error.email}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="required">{$messages.519} *</label>
       				<input type="text" name="c[email]" class="field" value="{$info.email}" /> 
       				{if $showCheckboxes}
       					<input type="checkbox" name="c[apply_to_all_email]" value="1" />{$messages.500109}
       					<input type="checkbox" name="d[expose_email]" value="1"{if $show->EXPOSE_EMAIL} checked="checked"{/if} />{$messages.1574}
       				{/if}
       				{if $error.email}<br /><span class="error_message">{$error.email}</span>{/if}
       			</div>
       				
       			
       			{if $rc->USE_REGISTRATION_COMPANY_NAME_FIELD}
       				<div class="{if $error.company_name}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_COMPANY_NAME_FIELD}required{else}field_label{/if}">{$messages.520}{if $rc->REQUIRE_REGISTRATION_COMPANY_NAME_FIELD} *{/if}</label>
       					<input type="text" name="c[company_name]" class="field" value="{$info.company_name|fromDB}" {if $rc->COMPANY_NAME_MAXLENGTH}maxlength="{$rc->COMPANY_NAME_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_company_name]" value="1"{if $show->EXPOSE_COMPANY_NAME} checked="checked"{/if} />{$messages.1574}{/if}
       					{if $error.company_name}<br /><span class="error_message">{$error.company_name}</span>{/if}
       				</div>
       			{/if}
       			{if $rc->USE_REGISTRATION_BUSINESS_TYPE_FIELD}
       				<div class="{cycle values='row_odd,row_even'}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_BUSINESS_TYPE_FIELD}required{else}field_label{/if}">{$messages.521}{if $rc->REQUIRE_REGISTRATION_BUSINESS_TYPE_FIELD} *{/if}</label>
       					<input type="radio" name="c[business_type]" value="1"{if $show->BUSINESS_TYPE == 1} checked="checked" {/if}/> {$messages.1572}
       					<input type="radio" name="c[business_type]" value="2"{if $show->BUSINESS_TYPE == 2} checked="checked" {/if}/> {$messages.1571}
       				</div>
       			{/if}
       			{if $rc->USE_REGISTRATION_FIRSTNAME_FIELD}
       				<div class="{if $error.firstname}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_FIRSTNAME_FIELD}required{else}field_label{/if}">{$messages.522}{if $rc->REQUIRE_REGISTRATION_FIRSTNAME_FIELD} *{/if}</label>
       					<input type="text" name="c[firstname]" class="field" value="{$info.firstname|fromDB}" {if $rc->FIRSTNAME_MAXLENGTH}maxlength="{$rc->FIRSTNAME_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_firstname]" value="1"{if $show->EXPOSE_FIRSTNAME} checked="checked"{/if} /> {$messages.1574}{/if}
       					{if $error.firstname}<br /><span class="error_message">{$error.firstname}</span>{/if}
       				</div>
       			{/if}
       				
       			{if $rc->USE_REGISTRATION_LASTNAME_FIELD}
       				<div class="{if $error.lastname}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_LASTNAME_FIELD}required{else}field_label{/if}">{$messages.523}{if $rc->REQUIRE_REGISTRATION_LASTNAME_FIELD} *{/if}</label>
       					<input type="text" name="c[lastname]" class="field" value="{$info.lastname|fromDB}" {if $rc->LASTNAME_MAXLENGTH}maxlength="{$rc->LASTNAME_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_lastname]" value="1"{if $show->EXPOSE_LASTNAME} checked="checked"{/if} /> {$messages.1574}{/if}
       					{if $error.lastname}<br /><span class="error_message">{$error.lastname}</span>{/if}
       				</div>
       			{/if}
       		
       			{if $rc->USE_REGISTRATION_ADDRESS_FIELD}
       				<div class="{if $error.address}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_ADDRESS_FIELD}required{else}field_label{/if}">{$messages.524}{if $rc->REQUIRE_REGISTRATION_ADDRESS_FIELD} *{/if}</label>
       					<input type="text" name="c[address]" class="field" value="{$info.address|fromDB}" {if $rc->ADDRESS_MAXLENGTH}maxlength="{$rc->ADDRESS_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_address]" value="1"{if $show->EXPOSE_ADDRESS} checked="checked"{/if} /> {$messages.1574}{/if}
       					{if $error.address}<br /><span class="error_message">{$error.address}</span>{/if}
       				</div>
       			{/if}
       			{if $rc->USE_REGISTRATION_ADDRESS2_FIELD}
       				<div class="{if $error.address_2}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_ADDRESS2_FIELD}required{else}field_label{/if}">{$messages.525}{if $rc->REQUIRE_REGISTRATION_ADDRESS2_FIELD} *{/if}</label>
       					<input type="text" name="c[address_2]" class="field" value="{$info.address_2|fromDB}" {if $rc->ADDRESS_2_MAXLENGTH}maxlength="{$rc->ADDRESS_2_MAXLENGTH}"{/if} />
       					{if $error.address_2}<br /><span class="error_message">{$error.address_2}</span>{/if}
       				</div>
       			{/if}
       			
       			{if $regionSelector}
       				<div class="{if $error.location}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					{$regionSelector}
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_city]" value="1"{if $show->EXPOSE_CITY || $show->EXPOSE_COUNTRY || $show->EXPOSE_STATE} checked="checked"{/if} /> {$messages.1574}{/if}
       					{if $error.location}<br /><span class="error_message">{$error.location}</span>{/if}
       				</div>
       			{/if}
       			
       			{if $rc->USE_REGISTRATION_CITY_FIELD && !$regionOverrides.city}
       				<div class="{if $error.city}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_CITY_FIELD}required{else}field_label{/if}">{$messages.526}{if $rc->REQUIRE_REGISTRATION_CITY_FIELD} *{/if}</label>
       					<input type="text" name="c[city]" class="field" value="{$info.city|fromDB}" {if $rc->CITY_MAXLENGTH}maxlength="{$rc->CITY_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_city]" value="1"{if $show->EXPOSE_CITY} checked="checked"{/if} /> {$messages.1574}{/if}
       					{if $error.city}<br /><span class="error_message">{$error.city}</span>{/if}
       				</div>
       			{/if}
       			
       			{if $rc->USE_REGISTRATION_ZIP_FIELD}
       				<div class="{if $error.zip}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_ZIP_FIELD}required{else}field_label{/if}">{$messages.528}{if $rc->REQUIRE_REGISTRATION_ZIP_FIELD} *{/if}</label>
       					<input type="text" name="c[zip]" class="field" value="{$info.zip|fromDB}" {if $rc->ZIP_MAXLENGTH}maxlength="{$rc->ZIP_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_zip]" value="1"{if $show->EXPOSE_ZIP} checked="checked"{/if} /> {$messages.1574}{/if}
       					{if $error.zip}<br /><span class="error_message">{$error.zip}</span>{/if}
       				</div>
       			{/if}
       			{if $rc->USE_REGISTRATION_PHONE_FIELD}
       				<div class="{if $error.phone}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_PHONE_FIELD}required{else}field_label{/if}">{$messages.530}{if $rc->REQUIRE_REGISTRATION_PHONE_FIELD} *{/if}</label>
       					<input type="text" name="c[phone]" class="field" value="{$info.phone|fromDB}" {if $rc->PHONE_MAXLENGTH}maxlength="{$rc->PHONE_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_phone]" value="1"{if $show->EXPOSE_PHONE} checked="checked"{/if} /> {$messages.1574}{/if}
       					{if $error.phone}<br /><span class="error_message">{$error.phone}</span>{/if}
       				</div>
       			{/if}
       			{if $rc->USE_REGISTRATION_PHONE2_FIELD}
       				<div class="{if $error.phone2}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_PHONE2_FIELD}required{else}field_label{/if}">{$messages.531}{if $rc->REQUIRE_REGISTRATION_PHONE2_FIELD} *{/if}</label>
       					<input type="text" name="c[phone2]" class="field" value="{$info.phone2|fromDB}" {if $rc->PHONE_2_MAXLENGTH}maxlength="{$rc->PHONE_2_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_phone2]" value="1"{if $show->EXPOSE_PHONE2} checked="checked"{/if} /> {$messages.1574}{/if}
       					{if $error.phone2}<br /><span class="error_message">{$error.phone2}</span>{/if}
       				</div>
       			{/if}
       			{if $rc->USE_REGISTRATION_FAX_FIELD}
       				<div class="{if $error.fax}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_FAX_FIELD}required{else}field_label{/if}">{$messages.532}{if $rc->REQUIRE_REGISTRATION_FAX_FIELD} *{/if}</label>
       					<input type="text" name="c[fax]" class="field" value="{$info.fax|fromDB}" {if $rc->FAX_MAXLENGTH}maxlength="{$rc->FAX_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_fax]" value="1"{if $show->EXPOSE_FAX} checked="checked"{/if} /> {$messages.1574}{/if}
       					{if $error.fax}<br /><span class="error_message">{$error.fax}</span>{/if}
       				</div>
       			{/if}
       			{if $rc->USE_REGISTRATION_URL_FIELD}
       				<div class="{if $error.url}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_URL_FIELD}required{else}field_label{/if}">{$messages.533}{if $rc->REQUIRE_REGISTRATION_URL_FIELD} *{/if}</label>
       					<input type="text" name="c[url]" class="field" value="{$info.url|fromDB}" {if $rc->URL_MAXLENGTH}maxlength="{$rc->URL_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_url]" value="1"{if $show->EXPOSE_URL} checked="checked"{/if} />{$messages.1574}{/if}
       					{if $error.url}<br /><span class="error_message">{$error.url}</span>{/if}
       				</div>
       			{/if}
       			{if count($orderItemFields) > 0}
       				{foreach $orderItemFields as $f}
       					<div class="{if $f.error}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       						{if $f.type == 'single_checkbox'}
       							<input type="hidden" value="0" name="{$f.name}" />
       							<input type="checkbox" value="1" name="{$f.name}" {if $f.checked}checked="checked"{/if} /> {$f.value}
       						{else}
       							<label class="{if $f.required}required{else}field_label{/if}">{$f.label}{if $f.required} *{/if}</label>
       							{$f.value}

       Near line 1, make the following changes:

       {* @git-info@ *}
       
       <div class="content_box">
       	<h1 class="title my_account">{$messages.636}</h1>
       	<h3 class="subtitle">{$messages.514}</h3>
       	<p class="page_instructions">{$messages.515}</p>
       	
       	<form action="{$formTarget}" autocomplete="off" method="post">
       		<div class="{cycle values='row_odd,row_even'}">
       			<label class="field_label">{$messages.516}</label>
       			{$show->USERNAME}
       		</div>
       		{if $requirePass}
       			<div class="{if $error.currentP}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="required">{$messages.500233} *</label>
       				<input type="password" name="c[currentP]" class="field" />
       				{if $error.currentP}<br /><span class="error_message">{$error.currentP}</span>{/if}
       			</div>
       		{/if}
       	
       		{if $canEditPassword}
       			<div class="{if $error.password}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="field_label">{$messages.517}</label>
       				<input type="password" name="c[password]" class="field" />
       				{if $error.password}<br /><span class="error_message">{$error.password}</span>{/if}
       			</div>
       {if $errorAdminUser}
       	<div class="field_error_box">For security reasons, the admin user's info may not be edited here.</div>
       {else}
       	<div class="content_box">
       		<h1 class="title my_account">{$messages.636}</h1>
       		<h3 class="subtitle">{$messages.514}</h3>
       		<p class="page_instructions">{$messages.515}</p>
       		
       		<form action="{$formTarget}" autocomplete="off" method="post">
       			<div class="{cycle values='row_odd,row_even'}">
       				<label class="field_label">{$messages.518}</label>
       				<input type="password" name="c[password_verify]" class="field" />
       				<label class="field_label">{$messages.516}</label>
       				{$show->USERNAME}
       			</div>
       		{elseif $demo}
       			<div class="field_error_row">This user's password may not be edited in the demo.</div>
       		{/if}
       			{if $requirePass}
       				<div class="{if $error.currentP}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="required">{$messages.500233} *</label>
       					<input type="password" name="c[currentP]" class="field" />
       					{if $error.currentP}<br /><span class="error_message">{$error.currentP}</span>{/if}
       				</div>
       			{/if}
       		
       		<div class="{if $error.email}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       			<label class="required">{$messages.519} *</label>
       			<input type="text" name="c[email]" class="field" value="{$info.email}" /> 
       			{if $showCheckboxes}
       				<input type="checkbox" name="c[apply_to_all_email]" value="1" />{$messages.500109}
       				<input type="checkbox" name="d[expose_email]" value="1"{if $show->EXPOSE_EMAIL} checked="checked"{/if} />{$messages.1574}
       			{if $canEditPassword}
       				<div class="{if $error.password}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="field_label">{$messages.517}</label>
       					<input type="password" name="c[password]" class="field" />
       					{if $error.password}<br /><span class="error_message">{$error.password}</span>{/if}
       				</div>
       				<div class="{cycle values='row_odd,row_even'}">
       					<label class="field_label">{$messages.518}</label>
       					<input type="password" name="c[password_verify]" class="field" />
       				</div>
       			{elseif $demo}
       				<div class="field_error_row">This user's password may not be edited in the demo.</div>
       			{/if}
       			{if $error.email}<br /><span class="error_message">{$error.email}</span>{/if}
       		</div>
       			
       		
       		{if $rc->USE_REGISTRATION_COMPANY_NAME_FIELD}
       			<div class="{if $error.company_name}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_COMPANY_NAME_FIELD}required{else}field_label{/if}">{$messages.520}{if $rc->REQUIRE_REGISTRATION_COMPANY_NAME_FIELD} *{/if}</label>
       				<input type="text" name="c[company_name]" class="field" value="{$info.company_name|fromDB}" {if $rc->COMPANY_NAME_MAXLENGTH}maxlength="{$rc->COMPANY_NAME_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_company_name]" value="1"{if $show->EXPOSE_COMPANY_NAME} checked="checked"{/if} />{$messages.1574}{/if}
       				{if $error.company_name}<br /><span class="error_message">{$error.company_name}</span>{/if}
       			</div>
       		{/if}
       		{if $rc->USE_REGISTRATION_BUSINESS_TYPE_FIELD}
       			<div class="{cycle values='row_odd,row_even'}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_BUSINESS_TYPE_FIELD}required{else}field_label{/if}">{$messages.521}{if $rc->REQUIRE_REGISTRATION_BUSINESS_TYPE_FIELD} *{/if}</label>
       				<input type="radio" name="c[business_type]" value="1"{if $show->BUSINESS_TYPE == 1} checked="checked" {/if}/> {$messages.1572}
       				<input type="radio" name="c[business_type]" value="2"{if $show->BUSINESS_TYPE == 2} checked="checked" {/if}/> {$messages.1571}
       			</div>
       		{/if}
       		{if $rc->USE_REGISTRATION_FIRSTNAME_FIELD}
       			<div class="{if $error.firstname}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_FIRSTNAME_FIELD}required{else}field_label{/if}">{$messages.522}{if $rc->REQUIRE_REGISTRATION_FIRSTNAME_FIELD} *{/if}</label>
       				<input type="text" name="c[firstname]" class="field" value="{$info.firstname|fromDB}" {if $rc->FIRSTNAME_MAXLENGTH}maxlength="{$rc->FIRSTNAME_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_firstname]" value="1"{if $show->EXPOSE_FIRSTNAME} checked="checked"{/if} /> {$messages.1574}{/if}
       				{if $error.firstname}<br /><span class="error_message">{$error.firstname}</span>{/if}
       			<div class="{if $error.email}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="required">{$messages.519} *</label>
       				<input type="text" name="c[email]" class="field" value="{$info.email}" /> 
       				{if $showCheckboxes}
       					<input type="checkbox" name="c[apply_to_all_email]" value="1" />{$messages.500109}
       					<input type="checkbox" name="d[expose_email]" value="1"{if $show->EXPOSE_EMAIL} checked="checked"{/if} />{$messages.1574}
       				{/if}
       				{if $error.email}<br /><span class="error_message">{$error.email}</span>{/if}
       			</div>
       		{/if}
       				
       			
       		{if $rc->USE_REGISTRATION_LASTNAME_FIELD}
       			<div class="{if $error.lastname}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_LASTNAME_FIELD}required{else}field_label{/if}">{$messages.523}{if $rc->REQUIRE_REGISTRATION_LASTNAME_FIELD} *{/if}</label>
       				<input type="text" name="c[lastname]" class="field" value="{$info.lastname|fromDB}" {if $rc->LASTNAME_MAXLENGTH}maxlength="{$rc->LASTNAME_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_lastname]" value="1"{if $show->EXPOSE_LASTNAME} checked="checked"{/if} /> {$messages.1574}{/if}
       				{if $error.lastname}<br /><span class="error_message">{$error.lastname}</span>{/if}
       			</div>
       		{/if}
       	
       		{if $rc->USE_REGISTRATION_ADDRESS_FIELD}
       			<div class="{if $error.address}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_ADDRESS_FIELD}required{else}field_label{/if}">{$messages.524}{if $rc->REQUIRE_REGISTRATION_ADDRESS_FIELD} *{/if}</label>
       				<input type="text" name="c[address]" class="field" value="{$info.address|fromDB}" {if $rc->ADDRESS_MAXLENGTH}maxlength="{$rc->ADDRESS_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_address]" value="1"{if $show->EXPOSE_ADDRESS} checked="checked"{/if} /> {$messages.1574}{/if}
       				{if $error.address}<br /><span class="error_message">{$error.address}</span>{/if}
       			</div>
       		{/if}
       		{if $rc->USE_REGISTRATION_ADDRESS2_FIELD}
       			<div class="{if $error.address_2}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_ADDRESS2_FIELD}required{else}field_label{/if}">{$messages.525}{if $rc->REQUIRE_REGISTRATION_ADDRESS2_FIELD} *{/if}</label>
       				<input type="text" name="c[address_2]" class="field" value="{$info.address_2|fromDB}" {if $rc->ADDRESS_2_MAXLENGTH}maxlength="{$rc->ADDRESS_2_MAXLENGTH}"{/if} />
       				{if $error.address_2}<br /><span class="error_message">{$error.address_2}</span>{/if}
       			</div>
       		{/if}
       		
       		{if $regionSelector}
       			<div class="{if $error.location}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				{$regionSelector}
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_city]" value="1"{if $show->EXPOSE_CITY || $show->EXPOSE_COUNTRY || $show->EXPOSE_STATE} checked="checked"{/if} /> {$messages.1574}{/if}
       				{if $error.location}<br /><span class="error_message">{$error.location}</span>{/if}
       			</div>
       		{/if}
       		
       		{if $rc->USE_REGISTRATION_CITY_FIELD && !$regionOverrides.city}
       			<div class="{if $error.city}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_CITY_FIELD}required{else}field_label{/if}">{$messages.526}{if $rc->REQUIRE_REGISTRATION_CITY_FIELD} *{/if}</label>
       				<input type="text" name="c[city]" class="field" value="{$info.city|fromDB}" {if $rc->CITY_MAXLENGTH}maxlength="{$rc->CITY_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_city]" value="1"{if $show->EXPOSE_CITY} checked="checked"{/if} /> {$messages.1574}{/if}
       				{if $error.city}<br /><span class="error_message">{$error.city}</span>{/if}
       			</div>
       		{/if}
       			{if $rc->USE_REGISTRATION_COMPANY_NAME_FIELD}
       				<div class="{if $error.company_name}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_COMPANY_NAME_FIELD}required{else}field_label{/if}">{$messages.520}{if $rc->REQUIRE_REGISTRATION_COMPANY_NAME_FIELD} *{/if}</label>
       					<input type="text" name="c[company_name]" class="field" value="{$info.company_name|fromDB}" {if $rc->COMPANY_NAME_MAXLENGTH}maxlength="{$rc->COMPANY_NAME_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_company_name]" value="1"{if $show->EXPOSE_COMPANY_NAME} checked="checked"{/if} />{$messages.1574}{/if}
       					{if $error.company_name}<br /><span class="error_message">{$error.company_name}</span>{/if}
       				</div>
       			{/if}
       			{if $rc->USE_REGISTRATION_BUSINESS_TYPE_FIELD}
       				<div class="{cycle values='row_odd,row_even'}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_BUSINESS_TYPE_FIELD}required{else}field_label{/if}">{$messages.521}{if $rc->REQUIRE_REGISTRATION_BUSINESS_TYPE_FIELD} *{/if}</label>
       					<input type="radio" name="c[business_type]" value="1"{if $show->BUSINESS_TYPE == 1} checked="checked" {/if}/> {$messages.1572}
       					<input type="radio" name="c[business_type]" value="2"{if $show->BUSINESS_TYPE == 2} checked="checked" {/if}/> {$messages.1571}
       				</div>
       			{/if}
       			{if $rc->USE_REGISTRATION_FIRSTNAME_FIELD}
       				<div class="{if $error.firstname}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_FIRSTNAME_FIELD}required{else}field_label{/if}">{$messages.522}{if $rc->REQUIRE_REGISTRATION_FIRSTNAME_FIELD} *{/if}</label>
       					<input type="text" name="c[firstname]" class="field" value="{$info.firstname|fromDB}" {if $rc->FIRSTNAME_MAXLENGTH}maxlength="{$rc->FIRSTNAME_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_firstname]" value="1"{if $show->EXPOSE_FIRSTNAME} checked="checked"{/if} /> {$messages.1574}{/if}
       					{if $error.firstname}<br /><span class="error_message">{$error.firstname}</span>{/if}
       				</div>
       			{/if}
       				
       			{if $rc->USE_REGISTRATION_LASTNAME_FIELD}
       				<div class="{if $error.lastname}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_LASTNAME_FIELD}required{else}field_label{/if}">{$messages.523}{if $rc->REQUIRE_REGISTRATION_LASTNAME_FIELD} *{/if}</label>
       					<input type="text" name="c[lastname]" class="field" value="{$info.lastname|fromDB}" {if $rc->LASTNAME_MAXLENGTH}maxlength="{$rc->LASTNAME_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_lastname]" value="1"{if $show->EXPOSE_LASTNAME} checked="checked"{/if} /> {$messages.1574}{/if}
       					{if $error.lastname}<br /><span class="error_message">{$error.lastname}</span>{/if}
       				</div>
       			{/if}
       		
       		{if $rc->USE_REGISTRATION_ZIP_FIELD}
       			<div class="{if $error.zip}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_ZIP_FIELD}required{else}field_label{/if}">{$messages.528}{if $rc->REQUIRE_REGISTRATION_ZIP_FIELD} *{/if}</label>
       				<input type="text" name="c[zip]" class="field" value="{$info.zip|fromDB}" {if $rc->ZIP_MAXLENGTH}maxlength="{$rc->ZIP_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_zip]" value="1"{if $show->EXPOSE_ZIP} checked="checked"{/if} /> {$messages.1574}{/if}
       				{if $error.zip}<br /><span class="error_message">{$error.zip}</span>{/if}
       			</div>
       		{/if}
       		{if $rc->USE_REGISTRATION_PHONE_FIELD}
       			<div class="{if $error.phone}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_PHONE_FIELD}required{else}field_label{/if}">{$messages.530}{if $rc->REQUIRE_REGISTRATION_PHONE_FIELD} *{/if}</label>
       				<input type="text" name="c[phone]" class="field" value="{$info.phone|fromDB}" {if $rc->PHONE_MAXLENGTH}maxlength="{$rc->PHONE_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_phone]" value="1"{if $show->EXPOSE_PHONE} checked="checked"{/if} /> {$messages.1574}{/if}
       				{if $error.phone}<br /><span class="error_message">{$error.phone}</span>{/if}
       			</div>
       		{/if}
       		{if $rc->USE_REGISTRATION_PHONE2_FIELD}
       			<div class="{if $error.phone2}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_PHONE2_FIELD}required{else}field_label{/if}">{$messages.531}{if $rc->REQUIRE_REGISTRATION_PHONE2_FIELD} *{/if}</label>
       				<input type="text" name="c[phone2]" class="field" value="{$info.phone2|fromDB}" {if $rc->PHONE_2_MAXLENGTH}maxlength="{$rc->PHONE_2_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_phone2]" value="1"{if $show->EXPOSE_PHONE2} checked="checked"{/if} /> {$messages.1574}{/if}
       				{if $error.phone2}<br /><span class="error_message">{$error.phone2}</span>{/if}
       			</div>
       		{/if}
       		{if $rc->USE_REGISTRATION_FAX_FIELD}
       			<div class="{if $error.fax}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_FAX_FIELD}required{else}field_label{/if}">{$messages.532}{if $rc->REQUIRE_REGISTRATION_FAX_FIELD} *{/if}</label>
       				<input type="text" name="c[fax]" class="field" value="{$info.fax|fromDB}" {if $rc->FAX_MAXLENGTH}maxlength="{$rc->FAX_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_fax]" value="1"{if $show->EXPOSE_FAX} checked="checked"{/if} /> {$messages.1574}{/if}
       				{if $error.fax}<br /><span class="error_message">{$error.fax}</span>{/if}
       			</div>
       		{/if}
       		{if $rc->USE_REGISTRATION_URL_FIELD}
       			<div class="{if $error.url}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $rc->REQUIRE_REGISTRATION_URL_FIELD}required{else}field_label{/if}">{$messages.533}{if $rc->REQUIRE_REGISTRATION_URL_FIELD} *{/if}</label>
       				<input type="text" name="c[url]" class="field" value="{$info.url|fromDB}" {if $rc->URL_MAXLENGTH}maxlength="{$rc->URL_MAXLENGTH}"{/if} />
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_url]" value="1"{if $show->EXPOSE_URL} checked="checked"{/if} />{$messages.1574}{/if}
       				{if $error.url}<br /><span class="error_message">{$error.url}</span>{/if}
       			</div>
       		{/if}
       		{if count($orderItemFields) > 0}
       			{foreach $orderItemFields as $f}
       				<div class="{if $f.error}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					{if $f.type == 'single_checkbox'}
       						<input type="hidden" value="0" name="{$f.name}" />
       						<input type="checkbox" value="1" name="{$f.name}" {if $f.checked}checked="checked"{/if} /> {$f.value}
       					{else}
       						<label class="{if $f.required}required{else}field_label{/if}">{$f.label}{if $f.required} *{/if}</label>
       						{$f.value}
       					{/if}
       					{if $f.error}
       						<br /><span class="error_message">{$f.error}</span>
       					{/if}
       			{if $rc->USE_REGISTRATION_ADDRESS_FIELD}
       				<div class="{if $error.address}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_ADDRESS_FIELD}required{else}field_label{/if}">{$messages.524}{if $rc->REQUIRE_REGISTRATION_ADDRESS_FIELD} *{/if}</label>
       					<input type="text" name="c[address]" class="field" value="{$info.address|fromDB}" {if $rc->ADDRESS_MAXLENGTH}maxlength="{$rc->ADDRESS_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_address]" value="1"{if $show->EXPOSE_ADDRESS} checked="checked"{/if} /> {$messages.1574}{/if}
       					{if $error.address}<br /><span class="error_message">{$error.address}</span>{/if}
       				</div>
       			{/foreach}
       		{/if}
       		{if count($addonFields) > 0}
       			{foreach $addonFields as $addon => $addonField}
       				{foreach $addonField as $f}
       			{/if}
       			{if $rc->USE_REGISTRATION_ADDRESS2_FIELD}
       				<div class="{if $error.address_2}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_ADDRESS2_FIELD}required{else}field_label{/if}">{$messages.525}{if $rc->REQUIRE_REGISTRATION_ADDRESS2_FIELD} *{/if}</label>
       					<input type="text" name="c[address_2]" class="field" value="{$info.address_2|fromDB}" {if $rc->ADDRESS_2_MAXLENGTH}maxlength="{$rc->ADDRESS_2_MAXLENGTH}"{/if} />
       					{if $error.address_2}<br /><span class="error_message">{$error.address_2}</span>{/if}
       				</div>
       			{/if}
       			
       			{if $regionSelector}
       				<div class="{if $error.location}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					{$regionSelector}
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_city]" value="1"{if $show->EXPOSE_CITY || $show->EXPOSE_COUNTRY || $show->EXPOSE_STATE} checked="checked"{/if} /> {$messages.1574}{/if}
       					{if $error.location}<br /><span class="error_message">{$error.location}</span>{/if}
       				</div>
       			{/if}
       			
       			{if $rc->USE_REGISTRATION_CITY_FIELD && !$regionOverrides.city}
       				<div class="{if $error.city}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_CITY_FIELD}required{else}field_label{/if}">{$messages.526}{if $rc->REQUIRE_REGISTRATION_CITY_FIELD} *{/if}</label>
       					<input type="text" name="c[city]" class="field" value="{$info.city|fromDB}" {if $rc->CITY_MAXLENGTH}maxlength="{$rc->CITY_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_city]" value="1"{if $show->EXPOSE_CITY} checked="checked"{/if} /> {$messages.1574}{/if}
       					{if $error.city}<br /><span class="error_message">{$error.city}</span>{/if}
       				</div>
       			{/if}
       			
       			{if $rc->USE_REGISTRATION_ZIP_FIELD}
       				<div class="{if $error.zip}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_ZIP_FIELD}required{else}field_label{/if}">{$messages.528}{if $rc->REQUIRE_REGISTRATION_ZIP_FIELD} *{/if}</label>
       					<input type="text" name="c[zip]" class="field" value="{$info.zip|fromDB}" {if $rc->ZIP_MAXLENGTH}maxlength="{$rc->ZIP_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_zip]" value="1"{if $show->EXPOSE_ZIP} checked="checked"{/if} /> {$messages.1574}{/if}
       					{if $error.zip}<br /><span class="error_message">{$error.zip}</span>{/if}
       				</div>
       			{/if}
       			{if $rc->USE_REGISTRATION_PHONE_FIELD}
       				<div class="{if $error.phone}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_PHONE_FIELD}required{else}field_label{/if}">{$messages.530}{if $rc->REQUIRE_REGISTRATION_PHONE_FIELD} *{/if}</label>
       					<input type="text" name="c[phone]" class="field" value="{$info.phone|fromDB}" {if $rc->PHONE_MAXLENGTH}maxlength="{$rc->PHONE_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_phone]" value="1"{if $show->EXPOSE_PHONE} checked="checked"{/if} /> {$messages.1574}{/if}
       					{if $error.phone}<br /><span class="error_message">{$error.phone}</span>{/if}
       				</div>
       			{/if}
       			{if $rc->USE_REGISTRATION_PHONE2_FIELD}
       				<div class="{if $error.phone2}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_PHONE2_FIELD}required{else}field_label{/if}">{$messages.531}{if $rc->REQUIRE_REGISTRATION_PHONE2_FIELD} *{/if}</label>
       					<input type="text" name="c[phone2]" class="field" value="{$info.phone2|fromDB}" {if $rc->PHONE_2_MAXLENGTH}maxlength="{$rc->PHONE_2_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_phone2]" value="1"{if $show->EXPOSE_PHONE2} checked="checked"{/if} /> {$messages.1574}{/if}
       					{if $error.phone2}<br /><span class="error_message">{$error.phone2}</span>{/if}
       				</div>
       			{/if}
       			{if $rc->USE_REGISTRATION_FAX_FIELD}
       				<div class="{if $error.fax}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_FAX_FIELD}required{else}field_label{/if}">{$messages.532}{if $rc->REQUIRE_REGISTRATION_FAX_FIELD} *{/if}</label>
       					<input type="text" name="c[fax]" class="field" value="{$info.fax|fromDB}" {if $rc->FAX_MAXLENGTH}maxlength="{$rc->FAX_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_fax]" value="1"{if $show->EXPOSE_FAX} checked="checked"{/if} /> {$messages.1574}{/if}
       					{if $error.fax}<br /><span class="error_message">{$error.fax}</span>{/if}
       				</div>
       			{/if}
       			{if $rc->USE_REGISTRATION_URL_FIELD}
       				<div class="{if $error.url}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $rc->REQUIRE_REGISTRATION_URL_FIELD}required{else}field_label{/if}">{$messages.533}{if $rc->REQUIRE_REGISTRATION_URL_FIELD} *{/if}</label>
       					<input type="text" name="c[url]" class="field" value="{$info.url|fromDB}" {if $rc->URL_MAXLENGTH}maxlength="{$rc->URL_MAXLENGTH}"{/if} />
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_url]" value="1"{if $show->EXPOSE_URL} checked="checked"{/if} />{$messages.1574}{/if}
       					{if $error.url}<br /><span class="error_message">{$error.url}</span>{/if}
       				</div>
       			{/if}
       			{if count($orderItemFields) > 0}
       				{foreach $orderItemFields as $f}
       					<div class="{if $f.error}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       						{if $f.type == 'single_checkbox'}
       							<input type="hidden" value="0" name="{$f.name}" />
       							<label><input type="checkbox" value="1" name="{$f.name}" {if $f.checked}checked="checked"{/if} /> {$f.value}</label>
       							<input type="checkbox" value="1" name="{$f.name}" {if $f.checked}checked="checked"{/if} /> {$f.value}
       						{else}
       							<label class="{if $f.required}required{else}field_label{/if}">{$f.label}{if $f.required} *{/if}</label>
       							{$f.value}

    2. Near line 181, FIND:
       

       						{/if}
       					</div>
       				{/foreach}
       			{/foreach}
       		{/if}
       		{foreach from=$optionals item=opt key=num}
       			<div class="{if $opt.error}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $opt.required}required{else}field_label{/if}">{$opt.label}{if $opt.required} *{/if}</label>
       				{if $opt.type == 'filter'}
       					{$opt.info} <input type="hidden" name="c[optional_field_{$num}]" value="{$opt.info}" />
       				{elseif $opt.type == 'text'}
       					<input type="text" name="c[optional_field_{$num}]" value="{$opt.info}" size="30" {if $opt.maxlen}maxlength="{$opt.maxlen}"{/if} class="field" /> 
       				{elseif $opt.type == 'area'}
       					<textarea name="c[optional_field_{$num}]" rows="8" cols="30" class="field" />{$opt.info}</textarea>
       				{elseif $opt.type == 'select'}
       					<select name="c[optional_field_{$num}]" class="field">
       						{foreach from=$opt.options item=drop}
       							<option value="{$drop.value}"{if $drop.selected} selected="selected"{/if}>{$drop.value}</option>
       						{/foreach}
       					</select>
       					{if $opt.useOther}
       						{$messages.1265} <input type="text" name="c[optional_field_{$num}_other]"{if $opt.matched} value="{$opt.info}"{/if} size="15" {if $opt.maxlen}maxlength="{$opt.maxlen}"{/if} class="field"/>
       					{/if}
       				{/if}
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_optional_{$num}]" value="1"{if $opt.exposeChecked} checked="checked"{/if} />{$messages.1574}{/if}
       				{if $opt.error}<br /><span class="error_message">{$opt.error}</span>{/if}
       			</div>
       		{/foreach}
       		
       		{if $feeshare_active == 1}
       			{if $feeshare_attachment_type == 1}
       				<div class="{cycle values='row_odd,row_even'}">
       					<label class="field_label">{$feeshare_attachtouserlabel}</label>
       					<textarea name="c[attached_user_message]" rows="8" cols="30" class="field" />{$feeshare_share_message}</textarea>
       				</div>
       			{elseif $feeshare_attachment_type == 2}
       				<div class="{cycle values='row_odd,row_even'}">
       					<label class="field_label">{$feeshare_attachtouserlabel}</label>
       					<select name="c[user_attachment_id]" class="field"> 
       						<option value="0"></option>
       					{foreach from=$feeshare_userattachmentchoices item=name key=userid}
       						<option value="{$userid}"{if $userid == $attachedtouser} selected="selected"{/if}>{$name}</option>
       					{/foreach}
       					</select>
       					{if $error.feeshareattachmenterror}
       						<span class="error_message">{$error.feeshareattachmenterror}</span>
       					{/if}
       				</div>			
       			
       			{/if}
       		
       		{/if}			
       		
       		{if $showCheckboxes}
       			<div class="{cycle values='row_odd,row_even'}">
       				<label class="field_label">{$messages.500126}</label>
       				<input type="checkbox" name="c[apply_to_all_listings]" value="1" />
       			</div>
       			
       			{if $using_mapping_fields}
       				<div class="{cycle values='row_odd,row_even'}">
       					<label class="field_label">{$messages.500127}</label>
       					<input type="checkbox" name="c[apply_to_mapping]" value="1" />
       				</div>
       			{/if}
       		{/if}
       		
       		<div class="center">
       			<input type="submit" value="{$messages.534}" class="button" />
       		</div>
       	</form>
       </div>
       
       <div class="center">
       	<a href="{$userManagementHomeLink}" class="button">{$messages.552}</a>
       </div>

       
       Replace With:

       						{/if}
       					</div>
       				{/foreach}
       			{/if}
       			{if count($addonFields) > 0}
       				{foreach $addonFields as $addon => $addonField}
       					{foreach $addonField as $f}
       						<div class="{if $f.error}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       							{if $f.type == 'single_checkbox'}
       								<input type="hidden" value="0" name="{$f.name}" />
       								<label><input type="checkbox" value="1" name="{$f.name}" {if $f.checked}checked="checked"{/if} /> {$f.value}</label>
       							{else}
       								<label class="{if $f.required}required{else}field_label{/if}">{$f.label}{if $f.required} *{/if}</label>
       								{$f.value}
       							{/if}
       							{if $f.error}
       								<br /><span class="error_message">{$f.error}</span>
       							{/if}
       						</div>
       					{/foreach}
       				{/foreach}
       			{/if}
       			{foreach from=$optionals item=opt key=num}
       				<div class="{if $opt.error}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $opt.required}required{else}field_label{/if}">{$opt.label}{if $opt.required} *{/if}</label>
       					{if $opt.type == 'filter'}
       						{$opt.info} <input type="hidden" name="c[optional_field_{$num}]" value="{$opt.info}" />
       					{elseif $opt.type == 'text'}
       						<input type="text" name="c[optional_field_{$num}]" value="{$opt.info}" size="30" {if $opt.maxlen}maxlength="{$opt.maxlen}"{/if} class="field" /> 
       					{elseif $opt.type == 'area'}
       						<textarea name="c[optional_field_{$num}]" rows="8" cols="30" class="field" />{$opt.info}</textarea>
       					{elseif $opt.type == 'select'}
       						<select name="c[optional_field_{$num}]" class="field">
       							{foreach from=$opt.options item=drop}
       								<option value="{$drop.value}"{if $drop.selected} selected="selected"{/if}>{$drop.value}</option>
       							{/foreach}
       						</select>
       						{if $opt.useOther}
       							{$messages.1265} <input type="text" name="c[optional_field_{$num}_other]"{if $opt.matched} value="{$opt.info}"{/if} size="15" {if $opt.maxlen}maxlength="{$opt.maxlen}"{/if} class="field"/>
       						{/if}
       					{/if}
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_optional_{$num}]" value="1"{if $opt.exposeChecked} checked="checked"{/if} />{$messages.1574}{/if}
       					{if $opt.error}<br /><span class="error_message">{$opt.error}</span>{/if}
       				</div>
       			{/foreach}
       			
       			{if $feeshare_active == 1}
       				{if $feeshare_attachment_type == 1}
       					<div class="{cycle values='row_odd,row_even'}">
       						<label class="field_label">{$feeshare_attachtouserlabel}</label>
       						<textarea name="c[attached_user_message]" rows="8" cols="30" class="field" />{$feeshare_share_message}</textarea>
       					</div>
       				{elseif $feeshare_attachment_type == 2}
       					<div class="{cycle values='row_odd,row_even'}">
       						<label class="field_label">{$feeshare_attachtouserlabel}</label>
       						<select name="c[user_attachment_id]" class="field"> 
       							<option value="0"></option>
       						{foreach from=$feeshare_userattachmentchoices item=name key=userid}
       							<option value="{$userid}"{if $userid == $attachedtouser} selected="selected"{/if}>{$name}</option>
       						{/foreach}
       						</select>
       						{if $error.feeshareattachmenterror}
       							<span class="error_message">{$error.feeshareattachmenterror}</span>
       						{/if}
       					</div>			
       				
       				{/if}
       			
       			{/if}			
       			
       			{if $showCheckboxes}
       				<div class="{cycle values='row_odd,row_even'}">
       					<label class="field_label">{$messages.500126}</label>
       					<input type="checkbox" name="c[apply_to_all_listings]" value="1" />
       				</div>
       				
       				{if $using_mapping_fields}
       					<div class="{cycle values='row_odd,row_even'}">
       						<label class="field_label">{$messages.500127}</label>
       						<input type="checkbox" name="c[apply_to_mapping]" value="1" />
       					</div>
       				{/if}
       			{/if}
       			
       			<div class="center">
       				<input type="submit" value="{$messages.534}" class="button" />
       			</div>
       		</form>
       	</div>
       	
       	<div class="center">
       		<a href="{$userManagementHomeLink}" class="button">{$messages.552}</a>
       	</div>
       {/if}

       Near line 181, make the following changes:

       						{/if}
       					</div>
       				{/foreach}
       			{/if}
       			{if count($addonFields) > 0}
       				{foreach $addonFields as $addon => $addonField}
       					{foreach $addonField as $f}
       						<div class="{if $f.error}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       							{if $f.type == 'single_checkbox'}
       								<input type="hidden" value="0" name="{$f.name}" />
       								<label><input type="checkbox" value="1" name="{$f.name}" {if $f.checked}checked="checked"{/if} /> {$f.value}</label>
       							{else}
       								<label class="{if $f.required}required{else}field_label{/if}">{$f.label}{if $f.required} *{/if}</label>
       								{$f.value}
       							{/if}
       							{if $f.error}
       								<br /><span class="error_message">{$f.error}</span>
       							{/if}
       						</div>
       					{/foreach}
       				{/foreach}
       			{/if}
       			{foreach from=$optionals item=opt key=num}
       				<div class="{if $opt.error}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       					<label class="{if $opt.required}required{else}field_label{/if}">{$opt.label}{if $opt.required} *{/if}</label>
       					{if $opt.type == 'filter'}
       						{$opt.info} <input type="hidden" name="c[optional_field_{$num}]" value="{$opt.info}" />
       					{elseif $opt.type == 'text'}
       						<input type="text" name="c[optional_field_{$num}]" value="{$opt.info}" size="30" {if $opt.maxlen}maxlength="{$opt.maxlen}"{/if} class="field" /> 
       					{elseif $opt.type == 'area'}
       						<textarea name="c[optional_field_{$num}]" rows="8" cols="30" class="field" />{$opt.info}</textarea>
       					{elseif $opt.type == 'select'}
       						<select name="c[optional_field_{$num}]" class="field">
       							{foreach from=$opt.options item=drop}
       								<option value="{$drop.value}"{if $drop.selected} selected="selected"{/if}>{$drop.value}</option>
       							{/foreach}
       						</select>
       						{if $opt.useOther}
       							{$messages.1265} <input type="text" name="c[optional_field_{$num}_other]"{if $opt.matched} value="{$opt.info}"{/if} size="15" {if $opt.maxlen}maxlength="{$opt.maxlen}"{/if} class="field"/>
       						{/if}
       					{/if}
       					{if $showCheckboxes}<input type="checkbox" name="d[expose_optional_{$num}]" value="1"{if $opt.exposeChecked} checked="checked"{/if} />{$messages.1574}{/if}
       					{if $opt.error}<br /><span class="error_message">{$opt.error}</span>{/if}
       				</div>
       			{/foreach}
       		{/if}
       		{foreach from=$optionals item=opt key=num}
       			<div class="{if $opt.error}field_error_row{else}{cycle values='row_odd,row_even'}{/if}">
       				<label class="{if $opt.required}required{else}field_label{/if}">{$opt.label}{if $opt.required} *{/if}</label>
       				{if $opt.type == 'filter'}
       					{$opt.info} <input type="hidden" name="c[optional_field_{$num}]" value="{$opt.info}" />
       				{elseif $opt.type == 'text'}
       					<input type="text" name="c[optional_field_{$num}]" value="{$opt.info}" size="30" {if $opt.maxlen}maxlength="{$opt.maxlen}"{/if} class="field" /> 
       				{elseif $opt.type == 'area'}
       					<textarea name="c[optional_field_{$num}]" rows="8" cols="30" class="field" />{$opt.info}</textarea>
       				{elseif $opt.type == 'select'}
       					<select name="c[optional_field_{$num}]" class="field">
       						{foreach from=$opt.options item=drop}
       							<option value="{$drop.value}"{if $drop.selected} selected="selected"{/if}>{$drop.value}</option>
       			
       			{if $feeshare_active == 1}
       				{if $feeshare_attachment_type == 1}
       					<div class="{cycle values='row_odd,row_even'}">
       						<label class="field_label">{$feeshare_attachtouserlabel}</label>
       						<textarea name="c[attached_user_message]" rows="8" cols="30" class="field" />{$feeshare_share_message}</textarea>
       					</div>
       				{elseif $feeshare_attachment_type == 2}
       					<div class="{cycle values='row_odd,row_even'}">
       						<label class="field_label">{$feeshare_attachtouserlabel}</label>
       						<select name="c[user_attachment_id]" class="field"> 
       							<option value="0"></option>
       						{foreach from=$feeshare_userattachmentchoices item=name key=userid}
       							<option value="{$userid}"{if $userid == $attachedtouser} selected="selected"{/if}>{$name}</option>
       						{/foreach}
       					</select>
       					{if $opt.useOther}
       						{$messages.1265} <input type="text" name="c[optional_field_{$num}_other]"{if $opt.matched} value="{$opt.info}"{/if} size="15" {if $opt.maxlen}maxlength="{$opt.maxlen}"{/if} class="field"/>
       					{/if}
       						</select>
       						{if $error.feeshareattachmenterror}
       							<span class="error_message">{$error.feeshareattachmenterror}</span>
       						{/if}
       					</div>			
       				
       				{/if}
       				{if $showCheckboxes}<input type="checkbox" name="d[expose_optional_{$num}]" value="1"{if $opt.exposeChecked} checked="checked"{/if} />{$messages.1574}{/if}
       				{if $opt.error}<br /><span class="error_message">{$opt.error}</span>{/if}
       			</div>
       		{/foreach}
       		
       		{if $feeshare_active == 1}
       			{if $feeshare_attachment_type == 1}
       				<div class="{cycle values='row_odd,row_even'}">
       					<label class="field_label">{$feeshare_attachtouserlabel}</label>
       					<textarea name="c[attached_user_message]" rows="8" cols="30" class="field" />{$feeshare_share_message}</textarea>
       				</div>
       			{elseif $feeshare_attachment_type == 2}
       				<div class="{cycle values='row_odd,row_even'}">
       					<label class="field_label">{$feeshare_attachtouserlabel}</label>
       					<select name="c[user_attachment_id]" class="field"> 
       						<option value="0"></option>
       					{foreach from=$feeshare_userattachmentchoices item=name key=userid}
       						<option value="{$userid}"{if $userid == $attachedtouser} selected="selected"{/if}>{$name}</option>
       					{/foreach}
       					</select>
       					{if $error.feeshareattachmenterror}
       						<span class="error_message">{$error.feeshareattachmenterror}</span>
       					{/if}
       				</div>			
       			
       			{/if}
       		
       		{/if}			
       		
       		{if $showCheckboxes}
       			<div class="{cycle values='row_odd,row_even'}">
       				<label class="field_label">{$messages.500126}</label>
       				<input type="checkbox" name="c[apply_to_all_listings]" value="1" />
       			</div>
       			{/if}			
       			
       			{if $using_mapping_fields}
       			{if $showCheckboxes}
       				<div class="{cycle values='row_odd,row_even'}">
       					<label class="field_label">{$messages.500127}</label>
       					<input type="checkbox" name="c[apply_to_mapping]" value="1" />
       					<label class="field_label">{$messages.500126}</label>
       					<input type="checkbox" name="c[apply_to_all_listings]" value="1" />
       				</div>
       				
       				{if $using_mapping_fields}
       					<div class="{cycle values='row_odd,row_even'}">
       						<label class="field_label">{$messages.500127}</label>
       						<input type="checkbox" name="c[apply_to_mapping]" value="1" />
       					</div>
       				{/if}
       			{/if}
       		{/if}
       		
       		<div class="center">
       			<input type="submit" value="{$messages.534}" class="button" />
       		</div>
       	</form>
       </div>
       
       <div class="center">
       	<a href="{$userManagementHomeLink}" class="button">{$messages.552}</a>
       </div>
       			
       			<div class="center">
       				<input type="submit" value="{$messages.534}" class="button" />
       			</div>
       		</form>
       	</div>
       	
       	<div class="center">
       		<a href="{$userManagementHomeLink}" class="button">{$messages.552}</a>
       	</div>
       {/if}

17.03.0 (March 14, 2017)

• Enhancements (3)
• Security Fixes (0)
• Fixes/Maintenance (15)
• Template Changes (7)

[Enhancements]

1759 - 3rd party library updated: SwiftMailer
1761 - Fully removed the old pre-v4 version of the My Account page, for simplicity
1764 - Clicking on My Account > Feedback Management while having open feedbacks now takes the user to the Open Feedbacks page

[Security Fixes]

- No Security fixes or patches for this release.

[Fixes/Maintenance]

1754 - Corrected a javascript error that could lock up pages for new visitors without the tinymce variable in local storage
1756 - Fixed a possible division-by-zero error in an extra questions template
1763 - Fixed javascript errors in listing placement page when WYSIWYG is turned OFF
1766 - Listing Exporter: fixed Export button not properly submitting the form
1770 - Buyer-Selected Cost Options may now be edited during a Listing Edit
1755 - Fixed a bug that could cause a Provider Fee to not delete itself when all items were removed from the Cart
1758 - Fixed description HTML printing in browse views
1760 - Fixed an case where PayPal Pro could sometimes try to use an outdated security certificate
1762 - Fixed auction Quantity Type field reverting to Item if set to Lot before a Listing Preview
1765 - Restored browser-default context menu when right-clicking on WYSIWYG
1767 - Fixed multi-quantity seller-buyer auctions multiplying the purchased quantity into the final price twice
1768 - Fixed admin wysiwyg stripping some HTML content that it shouldn't have
1769 - Fixed registration optional fields having incorrect starting values when editing a user's profile in the admin
1757 - Fixed JIT Re-Send Code button not working on some server configs
1771 - Fixed search_text cache sometimes not updating correctly when Copying a listing

[Template Changes]

Reference Purposes Only: Like the rest of this changelog, the template changes below are for reference purposes only, not (necessarily) a list of changes everyone needs to follow. Refer to the full update instructions to find if you need to make any template changes during an update.

This is a line that has been Added
This is a line that has been Removed
This is a line that has not changed.

1. In file external/js/gjmain.js
   
   
   Near line 1421, FIND:
   

   	},
   	
   	removeTiny : function () {
   		tinyMCE.remove();
   		localStorage.tinyMCE = 'off';
   	},

   
   Replace With:

   	},
   	
   	removeTiny : function () {
   		if(typeof tinyMCE !== 'undefined') tinyMCE.remove();
   		localStorage.tinyMCE = 'off';
   	},

   Near line 1421, make the following changes:

   	},
   	
   	removeTiny : function () {
   		tinyMCE.remove();
   		if(typeof tinyMCE !== 'undefined') tinyMCE.remove();
   		localStorage.tinyMCE = 'off';
   	},

2. In file external/js/listing_placement.js
   
   
   1. Near line 47, FIND:
      

      		//start up the tag autofill
      		geoListing.initTagAutofill();
      		//watch the auction type and buy now only fields for changes
      		jQuery('#buy_now_only').click(geoListing.auctionTypeChange);
      		jQuery('#auction_type').change(geoListing.auctionTypeChange);
      		
      		//make sure everything is shown/hidden correctly
      		geoListing.auctionTypeChange();
      		
      		if (jQuery('.combined_update_fields').length && jQuery('#combined_form').length) {
      			//Now for combined steps...

      
      Replace With:

      		//start up the tag autofill
      		geoListing.initTagAutofill();
      		//watch the auction type and buy now only fields for changes
      		jQuery('#buy_now_only').click(function() { geoListing.auctionTypeChange(true); });
      		jQuery('#auction_type').change(function() { geoListing.auctionTypeChange(true); });
      		
      		//make sure everything is shown/hidden correctly
      		geoListing.auctionTypeChange(false);
      		
      		if (jQuery('.combined_update_fields').length && jQuery('#combined_form').length) {
      			//Now for combined steps...

      Near line 47, make the following changes:

      		//start up the tag autofill
      		geoListing.initTagAutofill();
      		//watch the auction type and buy now only fields for changes
      		jQuery('#buy_now_only').click(geoListing.auctionTypeChange);
      		jQuery('#auction_type').change(geoListing.auctionTypeChange);
      		jQuery('#buy_now_only').click(function() { geoListing.auctionTypeChange(true); });
      		jQuery('#auction_type').change(function() { geoListing.auctionTypeChange(true); });
      		
      		//make sure everything is shown/hidden correctly
      		geoListing.auctionTypeChange();
      		geoListing.auctionTypeChange(false);
      		
      		if (jQuery('.combined_update_fields').length && jQuery('#combined_form').length) {
      			//Now for combined steps...

   2. Near line 246, FIND:
      

      		return true;
      	},
      	
      	auctionTypeChange : function ()
      	{
      		var auction_type_value = jQuery('#auction_type').val();
      		

      
      Replace With:

      		return true;
      	},
      	
      	auctionTypeChange : function (activeClick)
      	{
      		var auction_type_value = jQuery('#auction_type').val();
      		

      Near line 246, make the following changes:

      		return true;
      	},
      	
      	auctionTypeChange : function ()
      	auctionTypeChange : function (activeClick)
      	{
      		var auction_type_value = jQuery('#auction_type').val();
      		

   3. Near line 271, FIND:
      

      			
      			//show the applies box
      			jQuery('#price_applies_box').show('fast');
      			jQuery('#price_applies').show().val('item');
      			jQuery('#price_applies_no_bno').hide();
      		} else {
      			//show min and reserve row

      
      Replace With:

      			
      			//show the applies box
      			jQuery('#price_applies_box').show('fast');
      			jQuery('#price_applies').show();
      			if(activeClick) {
      				//only change the value in response to an actual user click
      				//(i.e. NOT when simply loading the page for the first time -- that is handled by template HTML)
      				jQuery('#price_applies').val('item');	
      			}
      			jQuery('#price_applies_no_bno').hide();
      		} else {
      			//show min and reserve row

      Near line 271, make the following changes:

      			
      			//show the applies box
      			jQuery('#price_applies_box').show('fast');
      			jQuery('#price_applies').show().val('item');
      			jQuery('#price_applies').show();
      			if(activeClick) {
      				//only change the value in response to an actual user click
      				//(i.e. NOT when simply loading the page for the first time -- that is handled by template HTML)
      				jQuery('#price_applies').val('item');	
      			}
      			jQuery('#price_applies_no_bno').hide();
      		} else {
      			//show min and reserve row

   4. Near line 282, FIND:
      

      			} else {
      				jQuery('#price_applies_box').show('fast');
      			}
      			jQuery('#price_applies').hide().val('lot');
      			jQuery('#price_applies_no_bno').show();
      		}
      		if (is_reverse) {

      
      Replace With:

      			} else {
      				jQuery('#price_applies_box').show('fast');
      			}
      			jQuery('#price_applies').hide();
      			if(activeClick) {
      				//only change the value in response to an actual user click
      				//(i.e. NOT when simply loading the page for the first time -- that is handled by template HTML)
      				jQuery('#price_applies').val('lot');
      			}
      			jQuery('#price_applies_no_bno').show();
      		}
      		if (is_reverse) {

      Near line 282, make the following changes:

      			} else {
      				jQuery('#price_applies_box').show('fast');
      			}
      			jQuery('#price_applies').hide().val('lot');
      			jQuery('#price_applies').hide();
      			if(activeClick) {
      				//only change the value in response to an actual user click
      				//(i.e. NOT when simply loading the page for the first time -- that is handled by template HTML)
      				jQuery('#price_applies').val('lot');
      			}
      			jQuery('#price_applies_no_bno').show();
      		}
      		if (is_reverse) {

3. In file external/js/plugins/utility.js
   
   
   Near line 17, FIND:
   

   		init : function (options) {
   			//Init doesn't need to do anything..
   			return this;
   			
   			return this.each(function(){
   				var $this=jQuery(this),
   					data = $this.data('gj');
   				if (!data) {
   					$this.data('gj',$this.extend({
   						
   					}, options));
   				}
   			});
   		},
   		
   		/**

   
   Replace With:

   		init : function (options) {
   			//Init doesn't need to do anything..
   			return this;
   		},
   		
   		/**

   Near line 17, make the following changes:

   		init : function (options) {
   			//Init doesn't need to do anything..
   			return this;
   			
   			return this.each(function(){
   				var $this=jQuery(this),
   					data = $this.data('gj');
   				if (!data) {
   					$this.data('gj',$this.extend({
   						
   					}, options));
   				}
   			});
   		},
   		
   		/**

4. In file system/order_items/shared/cost_options/edit.tpl
   
   
   1. Near line 10, FIND:
      

      		{else}
      			<input type="hidden" name="group_id" value="{$group_id}">
      		{/if}
      		<strong>{$messages.502249}</strong>
      		<input type="text" name="label" value="{$info.label}" placeholder="{$messages.502250}" maxlength="{$fields->cost_options->text_length}">
      		<br /><br />

      
      Replace With:

      		{else}
      			<input type="hidden" name="group_id" value="{$group_id}">
      		{/if}
      		{if $db_group_id}
      			<input type="hidden" name="db_group_id" value="{$db_group_id}">
      		{/if}
      		<strong>{$messages.502249}</strong>
      		<input type="text" name="label" value="{$info.label}" placeholder="{$messages.502250}" maxlength="{$fields->cost_options->text_length}">
      		<br /><br />

      Near line 10, make the following changes:

      		{else}
      			<input type="hidden" name="group_id" value="{$group_id}">
      		{/if}
      		{if $db_group_id}
      			<input type="hidden" name="db_group_id" value="{$db_group_id}">
      		{/if}
      		<strong>{$messages.502249}</strong>
      		<input type="text" name="label" value="{$info.label}" placeholder="{$messages.502250}" maxlength="{$fields->cost_options->text_length}">
      		<br /><br />

   2. Near line 85, FIND:
      

      							</td>
      							<td>
      								<input type="text" name="options[{$option_id}][label]" value="{$option.label}" placeholder="{$messages.502262}" value="">
      							</td>
      							<td style="white-space: nowrap;">
      								<span class="precurrency">{$precurrency}</span> <input type="text" name="options[{$option_id}][cost_added]" value="{$option.cost_added|displayPrice:'':''}" placeholder="{$messages.502263}" size="5">

      
      Replace With:

      							</td>
      							<td>
      								<input type="text" name="options[{$option_id}][label]" value="{$option.label}" placeholder="{$messages.502262}" value="">
      								{if $option.option_id}
      									{* this has a pre-existing db id that needs to be preserved (probably because this is a listing edit *}
      									<input type="hidden" name="options[{$option_id}][option_id]" value="{$option.option_id}" />
      								{/if}
      							</td>
      							<td style="white-space: nowrap;">
      								<span class="precurrency">{$precurrency}</span> <input type="text" name="options[{$option_id}][cost_added]" value="{$option.cost_added|displayPrice:'':''}" placeholder="{$messages.502263}" size="5">

      Near line 85, make the following changes:

      							</td>
      							<td>
      								<input type="text" name="options[{$option_id}][label]" value="{$option.label}" placeholder="{$messages.502262}" value="">
      								{if $option.option_id}
      									{* this has a pre-existing db id that needs to be preserved (probably because this is a listing edit *}
      									<input type="hidden" name="options[{$option_id}][option_id]" value="{$option.option_id}" />
      								{/if}
      							</td>
      							<td style="white-space: nowrap;">
      								<span class="precurrency">{$precurrency}</span> <input type="text" name="options[{$option_id}][cost_added]" value="{$option.cost_added|displayPrice:'':''}" placeholder="{$messages.502263}" size="5">

5. In file system/order_items/shared/jit_login_form.tpl
   
   
   1. Near line 18, FIND:
      

      		{if $errorMsg}<p class="error_message">{$errorMsg}</p>{/if}
      		{$securityImageHTML}
      		{if $require_email_confirmation}
      			<p>Confirmation Code: <input type="text" name="confirmation_code" /> <input type="button" class="button" value="{$messages.502206}" onclick="window.location.href='{$continueURL}&resend=1'" /></p>
      		{/if}
      		<p style="font-size: 18pt;"><a href="{$loginURL}">{$messages.500771}</a>{$messages.500772}<a href="{$continueURL}" onclick="jQuery('#continueForm').submit(); return false;">{$messages.500774}</a></p>
      	</form>

      
      Replace With:

      		{if $errorMsg}<p class="error_message">{$errorMsg}</p>{/if}
      		{$securityImageHTML}
      		{if $require_email_confirmation}
      			<p>Confirmation Code: <input type="text" name="confirmation_code" /> <input type="button" class="button" value="{$messages.502206}" onclick="window.location='{$continueURL}&resend=1'" /></p>
      		{/if}
      		<p style="font-size: 18pt;"><a href="{$loginURL}">{$messages.500771}</a>{$messages.500772}<a href="{$continueURL}" onclick="jQuery('#continueForm').submit(); return false;">{$messages.500774}</a></p>
      	</form>

      Near line 18, make the following changes:

      		{if $errorMsg}<p class="error_message">{$errorMsg}</p>{/if}
      		{$securityImageHTML}
      		{if $require_email_confirmation}
      			<p>Confirmation Code: <input type="text" name="confirmation_code" /> <input type="button" class="button" value="{$messages.502206}" onclick="window.location.href='{$continueURL}&resend=1'" /></p>
      			<p>Confirmation Code: <input type="text" name="confirmation_code" /> <input type="button" class="button" value="{$messages.502206}" onclick="window.location='{$continueURL}&resend=1'" /></p>
      		{/if}
      		<p style="font-size: 18pt;"><a href="{$loginURL}">{$messages.500771}</a>{$messages.500772}<a href="{$continueURL}" onclick="jQuery('#continueForm').submit(); return false;">{$messages.500774}</a></p>
      	</form>

   2. Near line 36, FIND:
      

      				</tr>
      				{if $require_email_confirmation}
      					<tr>
      						<td style="text-align: right; width: 50%;">Confirmation Code:</td><td><input type="text" name="confirmation_code" class="field login_field" /> <input type="button" value="{$messages.502206}" onclick="window.location.href='{$continueURL}&resend=1'" /></td>
      					</tr>
      				{/if}
      				<tr>

      
      Replace With:

      				</tr>
      				{if $require_email_confirmation}
      					<tr>
      						<td style="text-align: right; width: 50%;">Confirmation Code:</td><td><input type="text" name="confirmation_code" class="field login_field" /> <input type="button" value="{$messages.502206}" onclick="window.location='{$continueURL}&resend=1'" /></td>
      					</tr>
      				{/if}
      				<tr>

      Near line 36, make the following changes:

      				</tr>
      				{if $require_email_confirmation}
      					<tr>
      						<td style="text-align: right; width: 50%;">Confirmation Code:</td><td><input type="text" name="confirmation_code" class="field login_field" /> <input type="button" value="{$messages.502206}" onclick="window.location.href='{$continueURL}&resend=1'" /></td>
      						<td style="text-align: right; width: 50%;">Confirmation Code:</td><td><input type="text" name="confirmation_code" class="field login_field" /> <input type="button" value="{$messages.502206}" onclick="window.location='{$continueURL}&resend=1'" /></td>
      					</tr>
      				{/if}
      				<tr>

6. In file system/order_items/shared/questions.tpl
   
   
   1. Near line 15, FIND:
      

      	<table width="100%">
      	{foreach from=$questions key="display_order" item="order_questions"}
      		{foreach from=$order_questions item="question"}
      			{if $current_counter % $listing_process_count_columns == 0}<tr>{/if}
      			{assign var="key" value=$question.key}
      			
      			{if (($listing_process_count_columns == 0) || ($listing_process_count_columns == 1))}<div class="{cycle values='row_odd,row_even'}">{else}<td>{/if}

      
      Replace With:

      	<table width="100%">
      	{foreach from=$questions key="display_order" item="order_questions"}
      		{foreach from=$order_questions item="question"}
      			{if $listing_process_count_columns > 0 && $current_counter % $listing_process_count_columns == 0}<tr>{/if}
      			{assign var="key" value=$question.key}
      			
      			{if (($listing_process_count_columns == 0) || ($listing_process_count_columns == 1))}<div class="{cycle values='row_odd,row_even'}">{else}<td>{/if}

      Near line 15, make the following changes:

      	<table width="100%">
      	{foreach from=$questions key="display_order" item="order_questions"}
      		{foreach from=$order_questions item="question"}
      			{if $current_counter % $listing_process_count_columns == 0}<tr>{/if}
      			{if $listing_process_count_columns > 0 && $current_counter % $listing_process_count_columns == 0}<tr>{/if}
      			{assign var="key" value=$question.key}
      			
      			{if (($listing_process_count_columns == 0) || ($listing_process_count_columns == 1))}<div class="{cycle values='row_odd,row_even'}">{else}<td>{/if}

   2. Near line 58, FIND:
      

      					<input type="hidden" name="b[question_display_order][{$key}]" value="{$display_order}" />
      			{if (($listing_process_count_columns == 0) || ($listing_process_count_columns == 1))}</div>{else}</td>{/if}
      			{assign var=current_counter value=$current_counter+1}
      			{if $current_counter % $listing_process_count_columns == 0}</tr>{/if}
      		{/foreach}
      		
      	{/foreach}
      	{if $current_counter % $listing_process_count_columns != 0}</tr>{/if}
      	</table>
      {/if}

      
      Replace With:

      					<input type="hidden" name="b[question_display_order][{$key}]" value="{$display_order}" />
      			{if (($listing_process_count_columns == 0) || ($listing_process_count_columns == 1))}</div>{else}</td>{/if}
      			{assign var=current_counter value=$current_counter+1}
      			{if $listing_process_count_columns > 0 && $current_counter % $listing_process_count_columns == 0}</tr>{/if}
      		{/foreach}
      		
      	{/foreach}
      	{if $listing_process_count_columns > 0 && $current_counter % $listing_process_count_columns != 0}</tr>{/if}
      	</table>
      {/if}

      Near line 58, make the following changes:

      					<input type="hidden" name="b[question_display_order][{$key}]" value="{$display_order}" />
      			{if (($listing_process_count_columns == 0) || ($listing_process_count_columns == 1))}</div>{else}</td>{/if}
      			{assign var=current_counter value=$current_counter+1}
      			{if $current_counter % $listing_process_count_columns == 0}</tr>{/if}
      			{if $listing_process_count_columns > 0 && $current_counter % $listing_process_count_columns == 0}</tr>{/if}
      		{/foreach}
      		
      	{/foreach}
      	{if $current_counter % $listing_process_count_columns != 0}</tr>{/if}
      	{if $listing_process_count_columns > 0 && $current_counter % $listing_process_count_columns != 0}</tr>{/if}
      	</table>
      {/if}

7. In file system/tinymce.tpl
   
   
   1. Near line 13, FIND:
      

      			forced_root_block : '',
      			
      			content_css: '{if $inAdmin}../{/if}{external file="css/wysiwyg.css"}',
      			plugins: 'lists,link,paste,table,insertdatetime,code,preview,media,searchreplace,print,contextmenu,directionality,fullscreen,noneditable,visualchars,nonbreaking,emoticons,anchor,textcolor,colorpicker,charmap,searchreplace,hr',
      			toolbar: [
      			'undo redo | cut copy paste | formatselect fontsizeselect',
      			'bold italic underline strikethrough subscript superscript removeformat | alignleft aligncenter alignright alignjustify | outdent indent blockquote',

      
      Replace With:

      			forced_root_block : '',
      			
      			content_css: '{if $inAdmin}../{/if}{external file="css/wysiwyg.css"}',
      			plugins: 'lists,link,paste,table,insertdatetime,code,preview,media,searchreplace,print,directionality,fullscreen,noneditable,visualchars,nonbreaking,emoticons,anchor,textcolor,colorpicker,charmap,searchreplace,hr',
      			toolbar: [
      			'undo redo | cut copy paste | formatselect fontsizeselect',
      			'bold italic underline strikethrough subscript superscript removeformat | alignleft aligncenter alignright alignjustify | outdent indent blockquote',

      Near line 13, make the following changes:

      			forced_root_block : '',
      			
      			content_css: '{if $inAdmin}../{/if}{external file="css/wysiwyg.css"}',
      			plugins: 'lists,link,paste,table,insertdatetime,code,preview,media,searchreplace,print,contextmenu,directionality,fullscreen,noneditable,visualchars,nonbreaking,emoticons,anchor,textcolor,colorpicker,charmap,searchreplace,hr',
      			plugins: 'lists,link,paste,table,insertdatetime,code,preview,media,searchreplace,print,directionality,fullscreen,noneditable,visualchars,nonbreaking,emoticons,anchor,textcolor,colorpicker,charmap,searchreplace,hr',
      			toolbar: [
      			'undo redo | cut copy paste | formatselect fontsizeselect',
      			'bold italic underline strikethrough subscript superscript removeformat | alignleft aligncenter alignright alignjustify | outdent indent blockquote',

   2. Near line 31, FIND:
      

      		//when page is loaded, init the editor
      		jQuery(function () {
      			
      			if (localStorage.tinyMCE.length == 0 || localStorage.tinyMCE == 'on') {
      				gjWysiwyg.loadTiny();
      			}

      
      Replace With:

      		//when page is loaded, init the editor
      		jQuery(function () {
      			
      			if (typeof localStorage.tinyMCE == 'undefined' || localStorage.tinyMCE == 'on') {
      				gjWysiwyg.loadTiny();
      			}

      Near line 31, make the following changes:

      		//when page is loaded, init the editor
      		jQuery(function () {
      			
      			if (localStorage.tinyMCE.length == 0 || localStorage.tinyMCE == 'on') {
      			if (typeof localStorage.tinyMCE == 'undefined' || localStorage.tinyMCE == 'on') {
      				gjWysiwyg.loadTiny();
      			}