Merge github commits

4 files changed, 20 insertions, 20 deletions

diff --git a/admin/admin_layout_inc.php b/admin/admin_layout_inc.php
index f8b47c5..35a0da2 100644
--- a/admin/admin_layout_inc.php
+++ b/admin/admin_layout_inc.php
@@ -19,7 +19,7 @@ if( empty( $_REQUEST['module_package'] ) ) {
 }
 
 $feedback = array();
-$gBitSmarty->assign_by_ref( 'feedback', $feedback );
+$gBitSmarty->assignByRef( 'feedback', $feedback );
 $layoutHash = array(
 	'layout' => $_REQUEST['module_package'],
 	'fallback' => FALSE,
@@ -99,7 +99,7 @@ if( isset( $_REQUEST['module_id'] ) && !empty( $_REQUEST['move_module'] )) {
 // this will sort the layout selection dropdown
 $allLayouts = $gBitThemes->getAllLayouts();
 ksort( $allLayouts );
-$gBitSmarty->assign_by_ref( 'allLayouts', $allLayouts );
+$gBitSmarty->assignByRef( 'allLayouts', $allLayouts );
 $gBitSmarty->assign( 'module_package', $_REQUEST['module_package'] );
 
 $layoutHash = array(
@@ -130,19 +130,19 @@ $layoutAreas['right']  = 'r';
 if( $gBitSystem->isFeatureActive( 'site_bottom_column' )) {
 	$layoutAreas['bottom'] = 'b';
 }
-$gBitSmarty->assign_by_ref( 'layoutAreas', $layoutAreas );
+$gBitSmarty->assignByRef( 'layoutAreas', $layoutAreas );
 
 $allModules = $gBitThemes->getAllModules();
 ksort( $allModules );
-$gBitSmarty->assign_by_ref( 'allModules', $allModules );
+$gBitSmarty->assignByRef( 'allModules', $allModules );
 
 $allModulesHelp = $gBitThemes->getAllModules( 'modules', 'help_mod_' );
 ksort( $allModulesHelp );
-$gBitSmarty->assign_by_ref( 'allModulesHelp', $allModulesHelp );
+$gBitSmarty->assignByRef( 'allModulesHelp', $allModulesHelp );
 
 $allCenters = $gBitThemes->getAllModules( 'templates', 'center_' );
 ksort( $allCenters );
-$gBitSmarty->assign_by_ref( 'allCenters', $allCenters );
+$gBitSmarty->assignByRef( 'allCenters', $allCenters );
 
 $orders = array();
 
@@ -150,17 +150,17 @@ for( $i = 1; $i < 50; $i++ ) {
 	$orders[] = $i;
 }
 
-$gBitSmarty->assign_by_ref( 'orders', $orders );
+$gBitSmarty->assignByRef( 'orders', $orders );
 
 if( defined( 'ROLE_MODEL' )) {
 	$roles = $gBitUser->getAllUserRoles( ROOT_USER_ID );
-	$gBitSmarty->assign_by_ref( "roles", $roles );
+	$gBitSmarty->assignByRef( "roles", $roles );
 } else {
 	$groups = $gBitUser->getAllUserGroups( ROOT_USER_ID );
-	$gBitSmarty->assign_by_ref( "groups", $groups );
+	$gBitSmarty->assignByRef( "groups", $groups );
 }
 // we need gBitThemes as well
-$gBitSmarty->assign_by_ref( "gBitThemes", $gBitThemes );
+$gBitSmarty->assignByRef( "gBitThemes", $gBitThemes );
 
 $gBitThemes->loadJavascript( THEMES_PKG_PATH.'scripts/BitThemes.js', TRUE );
 ?>
diff --git a/admin/admin_layout_overview_inc.php b/admin/admin_layout_overview_inc.php
index 2e52660..e6edc7e 100644
--- a/admin/admin_layout_overview_inc.php
+++ b/admin/admin_layout_overview_inc.php
@@ -45,25 +45,25 @@ $layoutAreas['right']  = 'r';
 if( $gBitSystem->isFeatureActive( 'site_bottom_column' )) {
 	$layoutAreas['bottom'] = 'b';
 }
-$gBitSmarty->assign_by_ref( 'layoutAreas', $layoutAreas );
+$gBitSmarty->assignByRef( 'layoutAreas', $layoutAreas );
 
 $layouts = $gBitThemes->getAllLayouts();
 foreach( $layouts as $package => $layout ) {
 	$gBitThemes->generateModuleNames( $layout );
 	$layouts[$package] = $layout;
 }
-$gBitSmarty->assign_by_ref( 'layouts', $layouts );
+$gBitSmarty->assignByRef( 'layouts', $layouts );
 
 $allModulesHelp = $gBitThemes->getAllModules( 'modules', 'help_mod_' );
 ksort( $allModulesHelp );
-$gBitSmarty->assign_by_ref( 'allModulesHelp', $allModulesHelp );
+$gBitSmarty->assignByRef( 'allModulesHelp', $allModulesHelp );
 
 $gBitSmarty->assign( 'pageName', 'Layout Options' );
 if( defined( 'ROLE_MODEL' )) {
 	$roles = $gBitUser->getAllUserRoles( ROOT_USER_ID );
-	$gBitSmarty->assign_by_ref( "roles", $roles );
+	$gBitSmarty->assignByRef( "roles", $roles );
 } else {
 	$groups = $gBitUser->getAllUserGroups( ROOT_USER_ID );
-	$gBitSmarty->assign_by_ref( "groups", $groups );
+	$gBitSmarty->assignByRef( "groups", $groups );
 }
 ?>
diff --git a/admin/admin_themes_inc.php b/admin/admin_themes_inc.php
index ccd2d2e..bda7a98 100644
--- a/admin/admin_themes_inc.php
+++ b/admin/admin_themes_inc.php
@@ -78,7 +78,7 @@ $iconStyles = $gBitThemes->getStylesList( CONFIG_PKG_PATH."styles/icons/", NULL,
 foreach( $iconStyles as $key=>$style ){
 	$iconStyles[$key] = str_replace( "_", " ", $style['style'] );
 }
-$gBitSmarty->assign_by_ref( "iconStyles", $iconStyles );
+$gBitSmarty->assignByRef( "iconStyles", $iconStyles );
 
 $biticon_sizes = array(
 	'small' => tra( 'Small' ),
diff --git a/admin/admin_themes_manager.php b/admin/admin_themes_manager.php
index b8ac01d..bb29750 100644
--- a/admin/admin_themes_manager.php
+++ b/admin/admin_themes_manager.php
@@ -34,18 +34,18 @@ if( !empty( $_REQUEST["site_style"] ) ) {
 
 // Get list of available styles
 $styles = $gBitThemes->getStyles( NULL, TRUE );
-$gBitSmarty->assign_by_ref( "styles", $styles );
+$gBitSmarty->assignByRef( "styles", $styles );
 
 $subDirs = array( 'style_info', 'alternate' );
 $stylesList = $gBitThemes->getStylesList( NULL, NULL, $subDirs );
-$gBitSmarty->assign_by_ref( "stylesList", $stylesList );
+$gBitSmarty->assignByRef( "stylesList", $stylesList );
 
 $subDirs = array( 'style_info' );
 $iconStyles = $gBitThemes->getStylesList( CONFIG_PKG_PATH."iconsets/", NULL, $subDirs );
-$gBitSmarty->assign_by_ref( "iconStyles", $iconStyles );
+$gBitSmarty->assignByRef( "iconStyles", $iconStyles );
 
 $styleLayouts = $gBitThemes->getStyleLayouts();
-$gBitSmarty->assign_by_ref( "styleLayouts", $styleLayouts );
+$gBitSmarty->assignByRef( "styleLayouts", $styleLayouts );
 
 // pick some icons for the preview.
 $sampleIcons = array(