Merge branch 'master' of github.com:bitweaver/themes

4 files changed, 5 insertions, 3 deletions

diff --git a/smarty/libs/Smarty.class.php b/smarty/libs/Smarty.class.php
index 40532fc..dde8d5b 100644
--- a/smarty/libs/Smarty.class.php
+++ b/smarty/libs/Smarty.class.php
@@ -668,6 +668,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
         if (isset($allowed[$name])) {
             return $this->{$allowed[$name]}();
         } else {
+bt();
             trigger_error('Undefined property: '. get_class($this) .'::$'. $name, E_USER_NOTICE);
         }
     }
@@ -694,6 +695,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
         if (isset($allowed[$name])) {
             $this->{$allowed[$name]}($value);
         } else {
+bt();
             trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
         }
     }
diff --git a/smarty/libs/sysplugins/smarty_internal_compile_include_php.php b/smarty/libs/sysplugins/smarty_internal_compile_include_php.php
index d527123..4551179 100644
--- a/smarty/libs/sysplugins/smarty_internal_compile_include_php.php
+++ b/smarty/libs/sysplugins/smarty_internal_compile_include_php.php
@@ -105,4 +105,4 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/smartyplugins/resource.bitpackage.php b/smartyplugins/resource.bitpackage.php
index d0cd875..08ad9fe 100644
--- a/smartyplugins/resource.bitpackage.php
+++ b/smartyplugins/resource.bitpackage.php
@@ -42,7 +42,7 @@ class Smarty_Resource_Bitpackage extends Smarty_Resource_Custom {
 			if( !empty( $_template->tpl_vars['module_params'] ) ) {
 				// module_params were passed through via the {include},
 				// e.g. {include file="bitpackage:foobar/mod_list_foo.tpl" module_params="user_id=`$gBitUser->mUserId`&sort_mode=created_desc"}
-				$moduleParams['module_params'] = $gBitThemes->parseString( $pIncludeVars['module_params'] );
+				$moduleParams['module_params'] = $gBitThemes->parseString( $_template->tpl_vars['module_params']->value );
 			} elseif( !empty( $_template->tpl_vars['moduleParams'] ) ) {
 				// Module Params were passed in from the template, like kernel/dynamic.tpl
 				$moduleParams = $_template->tpl_vars['moduleParams']->value;
diff --git a/templates/module.tpl b/templates/module.tpl
index 0d6d3ce..52fecfb 100644
--- a/templates/module.tpl
+++ b/templates/module.tpl
@@ -16,7 +16,7 @@
 	{assign var=area value=$moduleArea}
 {/if}
 
-<div class="module{if !empty($modInfo.classplus)} {$modInfo.classplus}{/if} {$modInfo.name|replace:'_':'-'}" {if !empty($area)}id="{$area}{$moduleParams.pos}"{/if}>
+<div class="well module{if !empty($modInfo.classplus)} {$modInfo.classplus}{/if} {$modInfo.name|replace:'_':'-'}" {if !empty($area)}id="{$area}{$moduleParams.pos}"{/if}>
 	{if $modInfo.title}
 		<h4>
 			{if $gBitSystem->isFeatureActive( 'themes_module_controls' )}