Move from Smarty2 to Smarty3 function style

7 files changed, 23 insertions, 23 deletions

diff --git a/LibertyTranslations.php b/LibertyTranslations.php
index d0e0c1a..da53fc7 100644
--- a/LibertyTranslations.php
+++ b/LibertyTranslations.php
@@ -119,7 +119,7 @@ function translation_content_edit( &$pObject, &$pParamHash ) {
 	if( @BitBase::verifyId( $_REQUEST['i18n']['from_id'] ) ) {
 		// load the content we're translating from
 		$transObject = LibertyBase::getLibertyObject( $_REQUEST['i18n']['from_id'] );
-		$gBitSmarty->assign_by_ref( "translateFrom", $transObject );
+		$gBitSmarty->assignByRef( "translateFrom", $transObject );
 
 		// attempt google translation
 		if( !empty( $_REQUEST['i18n']['google'] ) && !empty( $transObject->mInfo['data'] )) {
diff --git a/admin/admin_languages_inc.php b/admin/admin_languages_inc.php
index 643c658..e65aae6 100644
--- a/admin/admin_languages_inc.php
+++ b/admin/admin_languages_inc.php
@@ -63,5 +63,5 @@ if( isset( $_REQUEST["prefs"] )) {
 // Get list of available languages
 $languages = array();
 $languages = $gBitLanguage->listLanguages();
-$gBitSmarty->assign_by_ref( "languages", $languages );
+$gBitSmarty->assignByRef( "languages", $languages );
 ?>
diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index 2a82f4e..5b9bf4f 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -11,7 +11,7 @@ $gBitSystem->registerPackage( $registerHash );
 // **********  BABELFISH  ************
 if ($gBitSystem->isFeatureActive('babelfish') ) {
 	require_once(LANGUAGES_PKG_PATH . 'Babelfish.php');
-	$gBitSmarty->assign_by_ref('babelfish_links', Babelfish::links( $gBitSystem->getConfig('language', 'en') ));
+	$gBitSmarty->assignByRef('babelfish_links', Babelfish::links( $gBitSystem->getConfig('language', 'en') ));
 }
 if ($gBitSystem->isFeatureActive('babelfish_logo') ) {
 	require_once(LANGUAGES_PKG_PATH . 'Babelfish.php');
@@ -40,7 +40,7 @@ if( !empty( $_REQUEST['oe'] ) && !empty( $gBitLanguage->mLanguageList[$_REQUEST[
 	$gBitLanguage->setLanguage( $_REQUEST['oe'] );
 }
 
-$gBitSmarty->assign_by_ref('gBitLanguage', $gBitLanguage);
+$gBitSmarty->assignByRef('gBitLanguage', $gBitLanguage);
 $gBitSmarty->assign('bitlanguage', $gBitLanguage->mLanguage);
 
 if( !empty( $gLibertySystem ) && $gBitSystem->isFeatureActive( 'i18n_content_translation' ) ) {
diff --git a/edit_languages.php b/edit_languages.php
index b4e20d8..24acb09 100644
--- a/edit_languages.php
+++ b/edit_languages.php
@@ -19,7 +19,7 @@ $gBitSystem->verifyPermission( 'p_languages_edit' );
 
 // Get available languages from DB
 $languages = $gBitLanguage->listLanguages();
-$gBitSmarty->assign_by_ref('languages', $languages);
+$gBitSmarty->assignByRef('languages', $languages);
 
 if( !empty( $_REQUEST['all_trans'] ) ) {
 	$gBitSmarty->assign( 'allTrans', 1 );
@@ -39,7 +39,7 @@ if( !empty( $_REQUEST['clear_cache'] ) ) {
 	$gBitSmarty->assign( 'translate', TRUE );
 	if( !empty( $_REQUEST['hash'] ) ) {
 		$tranStrings = $gBitLanguage->getTranslationString( $_REQUEST['hash'], $editLang );
-		$gBitSmarty->assign_by_ref('tranStrings', $tranStrings );
+		$gBitSmarty->assignByRef('tranStrings', $tranStrings );
 	} else {
 		// what strings do we want to display?
 		if( empty( $_REQUEST['char'] ) ) {
@@ -67,7 +67,7 @@ if( !empty( $_REQUEST['clear_cache'] ) ) {
 			}
 		}
 		$gBitSmarty->assign( 'char', empty( $_REQUEST['char'] ) ? '' : $_REQUEST['char'] );
-		$gBitSmarty->assign_by_ref( 'tranStrings', $tranStrings );
+		$gBitSmarty->assignByRef( 'tranStrings', $tranStrings );
 	}
 } elseif( isset($_REQUEST["delete_language"] ) ) {
 	if( $gBitUser->hasPermission( 'p_languages_delete' ) ) {
@@ -89,17 +89,17 @@ if( !empty( $_REQUEST['clear_cache'] ) ) {
 	if( $gBitLanguage->storeLanguage( $_REQUEST ) ) {
 		$languages = $gBitLanguage->listLanguages();
 		$gBitSmarty->assign( 'saveSuccess', tra( 'The language has been saved.' ) );
-		$gBitSmarty->assign_by_ref( 'defaults', $_REQUEST );
+		$gBitSmarty->assignByRef( 'defaults', $_REQUEST );
 	} else {
-		$gBitSmarty->assign_by_ref( 'saveErrors', $gBitLanguage->mErrors );
-		$gBitSmarty->assign_by_ref( 'defaults', $_REQUEST );
+		$gBitSmarty->assignByRef( 'saveErrors', $gBitLanguage->mErrors );
+		$gBitSmarty->assignByRef( 'defaults', $_REQUEST );
 		$gBitSmarty->assign( 'editDescription', TRUE );
 	}
 } elseif( isset($_REQUEST["new_language"] ) ) {
 	$gBitSmarty->assign( 'editDescription', TRUE );
 } elseif( isset($_REQUEST["edit_language"] ) ) {
 	if( !empty( $languages[$_REQUEST['lang']] ) ) {
-		$gBitSmarty->assign_by_ref( 'defaults', $languages[$_REQUEST['lang']] );
+		$gBitSmarty->assignByRef( 'defaults', $languages[$_REQUEST['lang']] );
 	}
 	$gBitSmarty->assign( 'editDescription', TRUE );
 }
diff --git a/import.php b/import.php
index 808d738..c18c801 100644
--- a/import.php
+++ b/import.php
@@ -27,7 +27,7 @@ foreach( array_keys($impLanguages) as $langCode ) {
 		unset( $impLanguages[$langCode] );
 	}
 }
-$gBitSmarty->assign_by_ref('impLanguages', $impLanguages );
+$gBitSmarty->assignByRef('impLanguages', $impLanguages );
 
 if (isset($_REQUEST["exp_language"])) {
 	$exp_language = $_REQUEST["exp_language"];
@@ -58,7 +58,7 @@ if (isset($_REQUEST["import"])) {
 	if( ($_REQUEST['overwrite'] == 'r') && !empty( $gBitLanguage->mImportConflicts ) ) {
 		unset( $impMsg['error'] );
 		$impMsg['warning'][] = tra( "Conflicts occured during language import" );
-		$gBitSmarty->assign_by_ref( 'impConflicts', $gBitLanguage->mImportConflicts );
+		$gBitSmarty->assignByRef( 'impConflicts', $gBitLanguage->mImportConflicts );
 		$mid = 'bitpackage:languages/import_resolve.tpl';
 	}
 
@@ -112,7 +112,7 @@ if (isset($_REQUEST["import"])) {
 
 // Get languages that can be exported
 $expLanguages = $gBitLanguage->getImportedLanguages();
-$gBitSmarty->assign_by_ref('expLanguages', $expLanguages );
+$gBitSmarty->assignByRef('expLanguages', $expLanguages );
 
 $gBitSmarty->assign( 'impmsg', $impMsg );
 
diff --git a/master_strings.php b/master_strings.php
index c88a824..9e92250 100644
--- a/master_strings.php
+++ b/master_strings.php
@@ -16,7 +16,7 @@ require_once( '../kernel/setup_inc.php' );
 $gBitSystem->verifyPermission( 'p_languages_edit_master' );
 
 $languages = $gBitLanguage->listLanguages();
-$gBitSmarty->assign_by_ref( 'languages', $languages );
+$gBitSmarty->assignByRef( 'languages', $languages );
 $feedback = $masterMsg = array();
 
 if( !empty( $_REQUEST['source_hash'] ) && !is_array( $_REQUEST['source_hash'] ) ) {
@@ -80,7 +80,7 @@ if( !empty( $_REQUEST['delete_master'] ) && !empty( $_REQUEST['source_hash'] ) )
 	}
 	$masterMsg['success'][] = 'Translation strings have been updated';
 } elseif( !empty( $_REQUEST['find'] ) && !empty( $_REQUEST['search'] ) ) {
-	$gBitSmarty->assign_by_ref( 'masterStrings', $gBitLanguage->searchMasterStrings( $_REQUEST['find'] ) );
+	$gBitSmarty->assignByRef( 'masterStrings', $gBitLanguage->searchMasterStrings( $_REQUEST['find'] ) );
 } else {
 	$gBitLanguage->loadMasterStrings(
 		NULL,
@@ -107,7 +107,7 @@ if( !empty( $_REQUEST['delete_master'] ) && !empty( $_REQUEST['source_hash'] ) )
 		}
 	}
 	$gBitSmarty->assign( 'char', empty( $_REQUEST['char'] ) ? '' : $_REQUEST['char'] );
-	$gBitSmarty->assign_by_ref( 'masterStrings', $masterStrings );
+	$gBitSmarty->assignByRef( 'masterStrings', $masterStrings );
 }
 
 
@@ -119,8 +119,8 @@ if( !empty( $_REQUEST['source_hash'] ) && empty( $_REQUEST['cancel'] ) ) {
 		}
 		$translate[$reqSourceHash] = $gBitLanguage->getTranslatedStrings( $_REQUEST['source_hash'] );
 	}
-	$gBitSmarty->assign_by_ref( 'masterStrings', $gBitLanguage->mStrings['master'] );
-	$gBitSmarty->assign_by_ref( 'tranStrings', $translate );
+	$gBitSmarty->assignByRef( 'masterStrings', $gBitLanguage->mStrings['master'] );
+	$gBitSmarty->assignByRef( 'tranStrings', $translate );
 	$gBitSmarty->assign( 'sources', $_REQUEST['source_hash'] );
 }
 
diff --git a/translate_strings.php b/translate_strings.php
index 8783da2..c6e460c 100644
--- a/translate_strings.php
+++ b/translate_strings.php
@@ -19,7 +19,7 @@ $gBitSystem->verifyPermission( 'p_languages_edit' );
 
 // Get available languages from DB
 $languages = $gBitLanguage->listLanguages();
-$gBitSmarty->assign_by_ref('languages', $languages);
+$gBitSmarty->assignByRef('languages', $languages);
 
 if( !empty( $_REQUEST['all_trans'] ) ) {
 	$gBitSmarty->assign( 'allTrans', 1 );
@@ -51,7 +51,7 @@ if( isset( $_REQUEST['save_translations'] ) ) {
 		}
 	}
 	$tranStrings = $gBitLanguage->getTranslationString( $sourceHash, $editLang );
-	$gBitSmarty->assign_by_ref('tranStrings', $tranStrings );
+	$gBitSmarty->assignByRef('tranStrings', $tranStrings );
 	$gBitSmarty->assign( 'lang', $editLang );
 	$gBitSmarty->assign( 'translate', TRUE );
 	$gBitSmarty->assign( 'saveSuccess', tra( "The following items have been saved successfully" ).":" );
@@ -60,7 +60,7 @@ if( isset( $_REQUEST['save_translations'] ) ) {
 
 if( !empty( $_REQUEST['hash'] ) ) {
 	$tranStrings = $gBitLanguage->getTranslationString( $_REQUEST['hash'], $editLang );
-	$gBitSmarty->assign_by_ref('tranStrings', $tranStrings );
+	$gBitSmarty->assignByRef('tranStrings', $tranStrings );
 } elseif( !empty( $_REQUEST['choose_lang'] ) ) {
 	$editLang = $_REQUEST['choose_lang'];
 	$gBitSmarty->assign( 'editLang', $editLang );
@@ -91,7 +91,7 @@ if( !empty( $_REQUEST['hash'] ) ) {
 		}
 	}
 	$gBitSmarty->assign( 'char', empty( $_REQUEST['char'] ) ? '' : $_REQUEST['char'] );
-	$gBitSmarty->assign_by_ref( 'tranStrings', $tranStrings );
+	$gBitSmarty->assignByRef( 'tranStrings', $tranStrings );
 }
 
 $gBitSystem->display( 'bitpackage:languages/translate_strings.tpl', tra( 'Edit Translations' ) , array( 'display_mode' => 'edit' ));