Index: branches/RC/themes/default2007/platform/elements/forms.tpl
===================================================================
diff -u -N -r10583 -r11226
--- branches/RC/themes/default2007/platform/elements/forms.tpl	(.../forms.tpl)	(revision 10583)
+++ branches/RC/themes/default2007/platform/elements/forms.tpl	(.../forms.tpl)	(revision 11226)
@@ -346,11 +346,11 @@
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="Captcha" title="$title"/>
 		<td class="field-value">
 			<inp2:m_if check="{$prefix}_HasError" field="Captcha">
-				<span class="field-error"><inp2:$prefix_Error field="Captcha"/></span><br />
+				<span class="field-error"><inp2:{$prefix}_Error field="Captcha"/></span><br />
 			</inp2:m_if>
 			<img src="<inp2:m_Link template="platform/inc/captcha_image" var="{$prefix}_captcha_code" w="150" h="30"/>" alt="<inp2:m_Phrase name="$title"/>"/><br />
 			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt=""/><br />
-			<input type="text" class="input-text" name="<inp2:$prefix_InputName field="Captcha"/>" value="<inp2:$prefix_Field field="Captcha"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_Param name="style"/>">
+			<input type="text" class="input-text" name="<inp2:{$prefix}_InputName field="Captcha"/>" value="<inp2:{$prefix}_Field field="Captcha"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_Param name="style"/>">
 		</td>
 	</tr>
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
Index: branches/RC/core/admin_templates/logs/change_logs/change_log_edit.tpl
===================================================================
diff -u -N -r10294 -r11226
--- branches/RC/core/admin_templates/logs/change_logs/change_log_edit.tpl	(.../change_log_edit.tpl)	(revision 10294)
+++ branches/RC/core/admin_templates/logs/change_logs/change_log_edit.tpl	(.../change_log_edit.tpl)	(revision 11226)
@@ -64,20 +64,20 @@
 <inp2:change-log_ErrorWarning name="form_error_warning"/>
 <div id="scroll_container">
 <table class="edit-form">
-	<inp2:m_ParseBlock name="subsection" title="!la_section_Page!"/>
+	<inp2:m_RenderElement name="subsection" title="!la_section_Page!"/>
 
-		<inp2:m_ParseBlock name="inp_id_label" prefix="change-log" field="ChangeLogId" title="!la_fld_Id!"/>
-		<inp2:m_ParseBlock name="inp_label" prefix="change-log" field="UserLogin" title="!la_fld_Login!" style="width: 100px"/>
-		<inp2:m_ParseBlock name="inp_label" prefix="change-log" field="UserFirstName" title="!la_fld_FirstName!" style="width: 100px"/>
-		<inp2:m_ParseBlock name="inp_label" prefix="change-log" field="UserLastName" title="!la_fld_LastName!" style="width: 100px"/>
-		<inp2:m_ParseBlock name="inp_label" prefix="change-log" field="SessionLogId" title="!la_fld_SessionLogId!" style="width: 100px"/>
-		<inp2:m_ParseBlock name="inp_label" prefix="change-log" field="Action" title="!la_fld_Action!" style="width: 100px"/>
-		<inp2:m_ParseBlock name="inp_label" prefix="change-log" field="OccuredOn" title="!la_fld_OccuredOn!" style="width: 100px"/>
-		<inp2:m_ParseBlock name="inp_label" prefix="change-log" field="MasterPrefix" title="!la_fld_MasterPrefix!" style="width: 100px"/>
-		<inp2:m_ParseBlock name="inp_label" prefix="change-log" field="MasterId" title="!la_fld_MasterId!" style="width: 100px"/>
-		<inp2:m_ParseBlock name="inp_label" prefix="change-log" field="Prefix" title="!la_fld_Prefix!" style="width: 100px"/>
-		<inp2:m_ParseBlock name="inp_label" prefix="change-log" field="ItemId" title="!la_fld_ItemId!" style="width: 100px"/>
-		<inp2:m_ParseBlock name="inp_label" prefix="change-log" field="Changes" no_special="1" title="!la_fld_Changes!" style="width: 100px"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="change-log" field="ChangeLogId" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="inp_label" prefix="change-log" field="UserLogin" title="!la_fld_Login!" style="width: 100px"/>
+		<inp2:m_RenderElement name="inp_label" prefix="change-log" field="UserFirstName" title="!la_fld_FirstName!" style="width: 100px"/>
+		<inp2:m_RenderElement name="inp_label" prefix="change-log" field="UserLastName" title="!la_fld_LastName!" style="width: 100px"/>
+		<inp2:m_RenderElement name="inp_label" prefix="change-log" field="SessionLogId" title="!la_fld_SessionLogId!" style="width: 100px"/>
+		<inp2:m_RenderElement name="inp_label" prefix="change-log" field="Action" title="!la_fld_Action!" style="width: 100px"/>
+		<inp2:m_RenderElement name="inp_label" prefix="change-log" field="OccuredOn" title="!la_fld_OccuredOn!" style="width: 100px"/>
+		<inp2:m_RenderElement name="inp_label" prefix="change-log" field="MasterPrefix" title="!la_fld_MasterPrefix!" style="width: 100px"/>
+		<inp2:m_RenderElement name="inp_label" prefix="change-log" field="MasterId" title="!la_fld_MasterId!" style="width: 100px"/>
+		<inp2:m_RenderElement name="inp_label" prefix="change-log" field="Prefix" title="!la_fld_Prefix!" style="width: 100px"/>
+		<inp2:m_RenderElement name="inp_label" prefix="change-log" field="ItemId" title="!la_fld_ItemId!" style="width: 100px"/>
+		<inp2:m_RenderElement name="inp_label" prefix="change-log" field="Changes" no_special="1" title="!la_fld_Changes!" style="width: 100px"/>
 
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 
Index: branches/RC/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -N -r10902 -r11226
--- branches/RC/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 10902)
+++ branches/RC/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 11226)
@@ -492,7 +492,7 @@
 	  				window.location.href = $window_url;
 	  			}
 
-	  			setTimeout('refresh_grid()', <inp2:$PrefixSpecial_AutoRefreshInterval/> * 60000);
+	  			setTimeout('refresh_grid()', <inp2:{$PrefixSpecial}_AutoRefreshInterval/> * 60000);
 	  		</inp2:m_if>
   		</inp2:m_if>
 
Index: branches/RC/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r11203 -r11226
--- branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11203)
+++ branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11226)
@@ -445,7 +445,7 @@
 							<inp2:m_param name="cat_name"/>
 						</inp2:m_DefineElement>
 
-						<inp2:$prefix_FieldCategoryPath field="$field" separator=" &gt; " render_as="category_caption"/>
+						<inp2:{$prefix}_FieldCategoryPath field="$field" separator=" &gt; " render_as="category_caption"/>
 						<inp2:m_RenderElement name="inp_edit_hidden" pass_params="1"/>
 					</td>
 					<td valign="middle">
@@ -737,30 +737,30 @@
 			<table>
 				<tr>
 					<td colspan="2">
-						<input type="button" class="button" style="width: 70px;" value="<inp2:m_Phrase name="la_btn_Add"/>" id="<inp2:$prefix_InputName field="$field"/>_add_button"/>
-						<input type="button" class="button" style="width: 70px;" value="<inp2:m_Phrase name="la_btn_Cancel"/>" id="<inp2:$prefix_InputName field="$field"/>_cancel_button"/>
+						<input type="button" class="button" style="width: 70px;" value="<inp2:m_Phrase name="la_btn_Add"/>" id="<inp2:{$prefix}_InputName field="$field"/>_add_button"/>
+						<input type="button" class="button" style="width: 70px;" value="<inp2:m_Phrase name="la_btn_Cancel"/>" id="<inp2:{$prefix}_InputName field="$field"/>_cancel_button"/>
 					</td>
 				</tr>
 				<tr>
 					<td valign="top">
-						<select multiple tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:$prefix_InputName field="$field"/>_minput" style="<inp2:m_Param name="style"/>">
+						<select multiple tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:{$prefix}_InputName field="$field"/>_minput" style="<inp2:m_Param name="style"/>">
 						</select>
 					</td>
 					<td valign="top">
 						<inp2:m_if check="m_Param" name="allow_edit">
-							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name="la_btn_Edit"/>" id="<inp2:$prefix_InputName field="$field"/>_edit_button"/><br />
+							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name="la_btn_Edit"/>" id="<inp2:{$prefix}_InputName field="$field"/>_edit_button"/><br />
 							<img src="img/spacer.gif" height="4" width="1" alt=""/><br />
 						</inp2:m_if>
 
 						<inp2:m_if check="m_Param" name="allow_delete">
-							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name="la_btn_Delete"/>" id="<inp2:$prefix_InputName field="$field"/>_delete_button"/><br />
+							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name="la_btn_Delete"/>" id="<inp2:{$prefix}_InputName field="$field"/>_delete_button"/><br />
 						</inp2:m_if>
 
 						<inp2:m_if check="m_Param" name="allow_move">
 							<br /><br />
-							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name="la_btn_MoveUp"/>" id="<inp2:$prefix_InputName field="$field"/>_moveup_button"/><br />
+							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name="la_btn_MoveUp"/>" id="<inp2:{$prefix}_InputName field="$field"/>_moveup_button"/><br />
 						<img src="img/spacer.gif" height="4" width="1" alt=""/><br />
-							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name="la_btn_MoveDown"/>" id="<inp2:$prefix_InputName field="$field"/>_movedown_button"/><br />
+							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name="la_btn_MoveDown"/>" id="<inp2:{$prefix}_InputName field="$field"/>_movedown_button"/><br />
 						</inp2:m_if>
 					</td>
 				</tr>
@@ -810,27 +810,27 @@
 							<option value="<inp2:Field name="$key_field" />"><inp2:Field name="$value_field" /></option>
 						</inp2:m_DefineElement>
 
-						<select multiple id="<inp2:$prefix_InputName name="$field" />_selected" style="<inp2:m_param name="style"/>" size="<inp2:m_param name="size"/>">
+						<select multiple id="<inp2:{$prefix}_InputName name="$field" />_selected" style="<inp2:m_param name="style"/>" size="<inp2:m_param name="size"/>">
 							<inp2:$optprefix.selected_PrintList render_as="picker_option_block" key_field="$option_key_field" value_field="$option_value_field" per_page="-1" link_to_prefix="$prefix" />
 						</select>
 					</td>
 					<td align="center">
-						<img src="img/icons/icon_left.gif" id="<inp2:$prefix_InputName name="$field" />_move_left_button"/><br />
-						<img src="img/icons/icon_right.gif" id="<inp2:$prefix_InputName name="$field" />_move_right_button"/>
+						<img src="img/icons/icon_left.gif" id="<inp2:{$prefix}_InputName name="$field" />_move_left_button"/><br />
+						<img src="img/icons/icon_right.gif" id="<inp2:{$prefix}_InputName name="$field" />_move_right_button"/>
 					</td>
 					<td>
-						<select multiple id="<inp2:$prefix_InputName name="$field" />_available" style="<inp2:m_param name="style"/>" size="<inp2:m_param name="size"/>">
+						<select multiple id="<inp2:{$prefix}_InputName name="$field" />_available" style="<inp2:m_param name="style"/>" size="<inp2:m_param name="size"/>">
 							<inp2:$optprefix.available_PrintList render_as="picker_option_block" key_field="$option_key_field" value_field="$option_value_field" per_page="-1" link_to_prefix="$prefix" />
 						</select>
 					</td>
 				</tr>
 			</table>
 
-			<input type="hidden" name="<inp2:$prefix_InputName name="$field" />" id="<inp2:$prefix_InputName name="$field" />" value="<inp2:$prefix_Field field="$field" db="db"/>">
-			<input type="hidden" name="unselected_<inp2:$prefix_InputName name="$field" />" id="<inp2:$prefix_InputName name="$field" />_available_field" value="">
+			<input type="hidden" name="<inp2:{$prefix}_InputName name="$field" />" id="<inp2:{$prefix}_InputName name="$field" />" value="<inp2:{$prefix}_Field field="$field" db="db"/>">
+			<input type="hidden" name="unselected_<inp2:{$prefix}_InputName name="$field" />" id="<inp2:{$prefix}_InputName name="$field" />_available_field" value="">
 
 			<script type="text/javascript">
-				<inp2:m_Param name="field"/> = new EditPickerControl('<inp2:m_Param name="field"/>', '<inp2:$prefix_InputName name="$field" />');
+				<inp2:m_Param name="field"/> = new EditPickerControl('<inp2:m_Param name="field"/>', '<inp2:{$prefix}_InputName name="$field" />');
 				<inp2:m_Param name="field"/>.SetMessage('nothing_selected', '<inp2:m_Phrase label="la_SelectItemToMove" escape="1"/>');
 			</script>
 
Index: branches/RC/core/admin_templates/logs/change_logs/change_log_list.tpl
===================================================================
diff -u -N -r10296 -r11226
--- branches/RC/core/admin_templates/logs/change_logs/change_log_list.tpl	(.../change_log_list.tpl)	(revision 10296)
+++ branches/RC/core/admin_templates/logs/change_logs/change_log_list.tpl	(.../change_log_list.tpl)	(revision 11226)
@@ -78,7 +78,7 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_ParseBlock name="grid" PrefixSpecial="change-log" IdField="ChangeLogId" grid="Default" grid_filters="1" limited_heights="1" row_class_render_as="row_class"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="change-log" IdField="ChangeLogId" grid="Default" grid_filters="1" limited_heights="1" row_class_render_as="row_class"/>
 <script type="text/javascript">
 	Grids['change-log'].SetDependantToolbarButtons( new Array('view_item') );
 </script>
Index: branches/RC/core/admin_templates/logs/search_logs/search_log_list.tpl
===================================================================
diff -u -N -r11161 -r11226
--- branches/RC/core/admin_templates/logs/search_logs/search_log_list.tpl	(.../search_log_list.tpl)	(revision 11161)
+++ branches/RC/core/admin_templates/logs/search_logs/search_log_list.tpl	(.../search_log_list.tpl)	(revision 11226)
@@ -78,7 +78,7 @@
 </tbody>
 </table>
 
-<inp2:m_ParseBlock name="grid" PrefixSpecial="search-log" IdField="SearchLogId" grid="Default"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="search-log" IdField="SearchLogId" grid="Default"/>
 <script type="text/javascript">
 	Grids['search-log'].SetDependantToolbarButtons( new Array('clear_selected') );
 </script>
Index: branches/RC/core/admin_templates/import/import_start.tpl
===================================================================
diff -u -N -r10665 -r11226
--- branches/RC/core/admin_templates/import/import_start.tpl	(.../import_start.tpl)	(revision 10665)
+++ branches/RC/core/admin_templates/import/import_start.tpl	(.../import_start.tpl)	(revision 11226)
@@ -1,6 +1,6 @@
 <inp2:adm_SetPopupSize width="500" height="270"/>
 <inp2:m_include t="incs/header"/>
-<inp2:m_ParseBlock name="section_header" icon="icon46_conf_regional" title="!la_title_Import!"/>
+<inp2:m_RenderElement name="section_header" icon="icon46_conf_regional" title="!la_title_Import!"/>
 
 <inp2:m_set adm_id="0" />
 
@@ -40,11 +40,11 @@
 
 <div id="scroll_container">
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
-	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
+	<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
 
-	<inp2:m_ParseBlock name="inp_edit_swf_upload" prefix="adm" field="ImportFile" title="!la_fld_ImportFile!"/>
-	<inp2:m_ParseBlock name="inp_edit_filler"/>
-	<!--<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="phrases.import" field="ImportOverwrite" hint_label="la_importlang_phrasewarning" title="la_prompt_overwritephrases"/>-->
+	<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="adm" field="ImportFile" title="!la_fld_ImportFile!"/>
+	<inp2:m_RenderElement name="inp_edit_filler"/>
+	<!--<inp2:m_RenderElement name="inp_edit_checkbox" prefix="phrases.import" field="ImportOverwrite" hint_label="la_importlang_phrasewarning" title="la_prompt_overwritephrases"/>-->
 </table>
 </div>
 
Index: branches/RC/core/admin_templates/logs/session_logs/session_log_list.tpl
===================================================================
diff -u -N -r10294 -r11226
--- branches/RC/core/admin_templates/logs/session_logs/session_log_list.tpl	(.../session_log_list.tpl)	(revision 10294)
+++ branches/RC/core/admin_templates/logs/session_logs/session_log_list.tpl	(.../session_log_list.tpl)	(revision 11226)
@@ -66,7 +66,7 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_ParseBlock name="grid" PrefixSpecial="session-log" IdField="SessionLogId" grid="Default" grid_filters="1" limited_heights="1" row_class_render_as="row_class"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="session-log" IdField="SessionLogId" grid="Default" grid_filters="1" limited_heights="1" row_class_render_as="row_class"/>
 <script type="text/javascript">
 	Grids['session-log'].SetDependantToolbarButtons( new Array() );
 </script>
Index: branches/RC/core/admin_templates/logs/email_logs/email_log_list.tpl
===================================================================
diff -u -N -r11154 -r11226
--- branches/RC/core/admin_templates/logs/email_logs/email_log_list.tpl	(.../email_log_list.tpl)	(revision 11154)
+++ branches/RC/core/admin_templates/logs/email_logs/email_log_list.tpl	(.../email_log_list.tpl)	(revision 11226)
@@ -61,6 +61,6 @@
 </tbody>
 </table>
 
-<inp2:m_ParseBlock name="grid" PrefixSpecial="email-log" IdField="EmailLogId" grid="Default"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="email-log" IdField="EmailLogId" grid="Default"/>
 
 <inp2:m_include t="incs/footer"/>
Index: branches/RC/core/admin_templates/groups/permissions_selector.tpl
===================================================================
diff -u -N -r11190 -r11226
--- branches/RC/core/admin_templates/groups/permissions_selector.tpl	(.../permissions_selector.tpl)	(revision 11190)
+++ branches/RC/core/admin_templates/groups/permissions_selector.tpl	(.../permissions_selector.tpl)	(revision 11226)
@@ -34,7 +34,7 @@
 			<inp2:m_param name="section_name"/>.<inp2:m_param name="perm_name"/>
 		</td>
 		<td>
-	 		<input type="hidden" id="<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" name="<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" value="<inp2:$prefix_PermissionValue section_name="$section_name" perm_name="$perm_name"/>">
+	 		<input type="hidden" id="<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" name="<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" value="<inp2:{$prefix}_PermissionValue section_name="$section_name" perm_name="$perm_name"/>">
 			<input type="checkbox" align="absmiddle" id="_cb_<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" name="_cb_<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" <inp2:m_if check="{$prefix}_PermissionValue" section_name="$section_name" perm_name="$perm_name" value="1">checked</inp2:m_if> onchange="update_checkbox(this, document.getElementById('<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]'));">
 		</td>
 	</tr>
@@ -47,7 +47,7 @@
 			<inp2:m_phrase name="$label"/>
 		</td>
 		<td>
-	 		<input type="hidden" id="<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" name="<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" value="<inp2:$prefix_PermissionValue section_name="$section_name" perm_name="$perm_name"/>">
+	 		<input type="hidden" id="<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" name="<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" value="<inp2:{$prefix}_PermissionValue section_name="$section_name" perm_name="$perm_name"/>">
 			<input type="checkbox" align="absmiddle" id="_cb_<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" name="_cb_<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" <inp2:m_if check="{$prefix}_PermissionValue" section_name="$section_name" perm_name="$perm_name" value="1">checked</inp2:m_if> onchange="update_checkbox(this, document.getElementById('<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]'));">
 		</td>
 	</tr>
Index: branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl
===================================================================
diff -u -N -r11154 -r11226
--- branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl	(.../email_queue_list.tpl)	(revision 11154)
+++ branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl	(.../email_queue_list.tpl)	(revision 11226)
@@ -91,7 +91,7 @@
 	</td>
 </inp2:m_DefineElement>
 
-<inp2:m_ParseBlock name="grid" PrefixSpecial="email-queue" IdField="EmailQueueId" grid="Default"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="email-queue" IdField="EmailQueueId" grid="Default"/>
 <script type="text/javascript">
 	Grids['email-queue'].SetDependantToolbarButtons( new Array('delete') );
 </script>
Index: branches/RC/core/admin_templates/groups/groups_edit_permissions.tpl
===================================================================
diff -u -N -r11190 -r11226
--- branches/RC/core/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 11190)
+++ branches/RC/core/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 11226)
@@ -56,7 +56,7 @@
 <inp2:m_DefineElement name="permission_element" prefix="g-perm" onclick="">
 	<td>
 		<inp2:m_if check="{$prefix}_HasPermission" perm_name="$perm_name" section_name="$section_name">
-	 		<input type="hidden" id="<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" name="<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" value="<inp2:$prefix_PermissionValue section_name="$section_name" perm_name="$perm_name"/>">
+	 		<input type="hidden" id="<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" name="<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" value="<inp2:{$prefix}_PermissionValue section_name="$section_name" perm_name="$perm_name"/>">
 			<input type="checkbox" align="absmiddle" id="_cb_<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" name="_cb_<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" <inp2:m_if check="{$prefix}_PermissionValue" section_name="$section_name" perm_name="$perm_name" value="1">checked</inp2:m_if> onchange="update_checkbox(this, document.getElementById('<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]'));" onclick="<inp2:m_param name="onclick"/>">
  		<inp2:m_else/>
  			&nbsp;