fix module layout variable collision

2 files changed, 18 insertions, 7 deletions

diff --git a/admin/admin_layout_inc.php b/admin/admin_layout_inc.php
index 025662d..f6d4b01 100644
--- a/admin/admin_layout_inc.php
+++ b/admin/admin_layout_inc.php
@@ -93,9 +93,20 @@ $layoutHash = array(
 	'layout' => $_REQUEST['module_package'],
 	'fallback' => FALSE,
 );
-$layout = $gBitThemes->getLayout( $layoutHash );
-$gBitThemes->generateModuleNames( $layout );
-$gBitSmarty->assign_by_ref( 'layout', $layout );
+$editLayout = $gBitThemes->getLayout( $layoutHash );
+$gBitThemes->generateModuleNames( $editLayout );
+$gBitSmarty->assign( 'editLayout', $editLayout );
+
+$combinedList = array_merge( array_keys( $gBitSystem->mPackages ), array_keys( $allLayouts ) );
+$layoutList = array();
+foreach( $combinedList as $l ) {
+	$layoutList[$l] = $l;
+	if( isset( $allLayouts[$l] ) ) {
+		$layoutList[$l] .= ' *';
+	}
+}
+asort( $layoutList );
+$gBitSmarty->assign( 'layoutList', $layoutList );
 
 if( $gBitSystem->isFeatureActive( 'site_top_column' )) {
 	$layoutAreas['top'] = 't';
diff --git a/templates/admin_layout.tpl b/templates/admin_layout.tpl
index d6690ea..e7fd919 100644
--- a/templates/admin_layout.tpl
+++ b/templates/admin_layout.tpl
@@ -7,12 +7,12 @@
 				{formlabel label="Customized layout" for="module_package"}
 				{forminput}
 					<select name="module_package" id="module_package" onchange="this.form.submit();">
-						{foreach key=layoutName item=layout from=$gBitThemes->getAllLayouts()}
+						{foreach key=layoutName item=layoutDisplay from=$layoutList}
 							<option value="{$layoutName}" {if $module_package == $layoutName}selected="selected"{/if}>
 								{if $layoutName eq 'kernel'}
 									{tr}Site Default{/tr}
 								{else}
-									{tr}{$layoutName|capitalize}{/tr}
+									{tr}{$layoutDisplay|capitalize}{/tr}
 								{/if}
 							</option>
 						{/foreach}
@@ -66,10 +66,10 @@
 							<tr>
 								<th>{tr}{$colkey} area{/tr}</th>
 							</tr>
-							{section name=ix loop=$layout.$area}
+							{section name=ix loop=$editLayout.$area}
 								<tr>
 									<td>
-										{include file="bitpackage:themes/module_config_inc.tpl" modInfo=$layout.$area[ix] condensed=1}
+										{include file="bitpackage:themes/module_config_inc.tpl" modInfo=$editLayout.$area[ix] condensed=1}
 									</td>
 								</tr>
 							{sectionelse}