merge recent changes with HEAD - R1 and HEAD are identical now

12 files changed, 69 insertions, 69 deletions

diff --git a/BitLanguage.php b/BitLanguage.php
index 15a7d6d..4acd3c6 100644
--- a/BitLanguage.php
+++ b/BitLanguage.php
@@ -14,7 +14,7 @@
 // +----------------------------------------------------------------------+
 // | Authors: spider <spider@steelsun.com>
 // +----------------------------------------------------------------------+
-// $Id: BitLanguage.php,v 1.5 2005/07/25 20:02:11 squareing Exp $
+// $Id: BitLanguage.php,v 1.6 2005/08/01 18:40:39 squareing Exp $
 
 class BitLanguage extends BitBase {
 	// list of available (non-disabled) languages
@@ -184,9 +184,9 @@ class BitLanguage extends BitBase {
 
 
 	function storeMasterString( $pParamHash ) {
-		global $smarty;
-		if( !empty( $smarty->mCompileRsrc ) ) {
-			list($type, $location) = split( ':', $smarty->mCompileRsrc );
+		global $gBitSmarty;
+		if( !empty( $gBitSmarty->mCompileRsrc ) ) {
+			list($type, $location) = split( ':', $gBitSmarty->mCompileRsrc );
 			list($package, $file) = split( '/', $location );
 		} else {
 			$package = NULL;
diff --git a/admin/admin_languages_inc.php b/admin/admin_languages_inc.php
index cb0b087..aa7886e 100644
--- a/admin/admin_languages_inc.php
+++ b/admin/admin_languages_inc.php
@@ -18,7 +18,7 @@ $formLanguageToggles = array(
 		),
 	),
 );
-$smarty->assign( 'formLanguageToggles',$formLanguageToggles );
+$gBitSmarty->assign( 'formLanguageToggles',$formLanguageToggles );
 
 // Handle Update
 if (isset($_REQUEST["prefs"])) {
@@ -36,11 +36,11 @@ if (isset($_REQUEST["prefs"])) {
 	global $gBitLanguage;
 	$gBitLanguage->setLanguage( $gBitSystem->getPreference( 'bitlanguage' ) );
 } else {
-	$smarty->assign("language", $gBitSystem->getPreference("language", "en"));
+	$gBitSmarty->assign("language", $gBitSystem->getPreference("language", "en"));
 }
 
 // Get list of available languages
 $languages = array();
 $languages = $gBitLanguage->listLanguages();
-$smarty->assign_by_ref("languages",$languages );
+$gBitSmarty->assign_by_ref("languages",$languages );
 ?>
diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index 5923b93..fb6de7d 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -1,5 +1,5 @@
 <?php
-	global $gBitSystem, $gBitLanguage, $gBitUser, $smarty;
+	global $gBitSystem, $gBitLanguage, $gBitUser, $gBitSmarty;
 
 	$gBitSystem->registerPackage( 'languages', dirname( __FILE__).'/' );
 
@@ -7,12 +7,12 @@
 	if ($gBitSystem->getPreference('feature_babelfish') == 'y')
 	{
 		require_once(LANGUAGES_PKG_PATH . 'Babelfish.php');
-		$smarty->assign_by_ref('babelfish_links', Babelfish::links( $gBitSystem->getPreference('language', 'en') ));
+		$gBitSmarty->assign_by_ref('babelfish_links', Babelfish::links( $gBitSystem->getPreference('language', 'en') ));
 	}
 	if ($gBitSystem->getPreference('feature_babelfish_logo') == 'y')
 	{
 		require_once(LANGUAGES_PKG_PATH . 'Babelfish.php');
-		$smarty->assign('babelfish_logo', Babelfish::logo($gBitLanguage->mLanguage));
+		$gBitSmarty->assign('babelfish_logo', Babelfish::logo($gBitLanguage->mLanguage));
 	}
 	if( $gBitSystem->isPackageActive( 'languages' ) ) {
 		if( $gBitUser->isRegistered() ) {
@@ -34,5 +34,5 @@
 		$gBitLanguage->setLanguage( $_REQUEST['oe'] );
 	}
 
-	$smarty->assign('bitlanguage', $gBitLanguage->mLanguage);
+	$gBitSmarty->assign('bitlanguage', $gBitLanguage->mLanguage);
 ?>
diff --git a/edit_languages.php b/edit_languages.php
index 522a37f..a6c8ccc 100644
--- a/edit_languages.php
+++ b/edit_languages.php
@@ -1,6 +1,6 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_languages/edit_languages.php,v 1.1 2005/06/19 04:54:47 bitweaver Exp $
+// $Header: /cvsroot/bitweaver/_bit_languages/edit_languages.php,v 1.2 2005/08/01 18:40:39 squareing Exp $
 
 // Copyright (c) 2005, bitweaver.org
 // All Rights Reserved. See copyright.txt for details and a complete list of authors.
@@ -13,27 +13,27 @@ $gBitSystem->verifyPermission( 'bit_p_edit_languages' );
 
 // Get available languages from DB
 $languages = $gBitLanguage->listLanguages();
-$smarty->assign_by_ref('languages', $languages);
+$gBitSmarty->assign_by_ref('languages', $languages);
 
 if( !empty( $_REQUEST['all_trans'] ) ) {
-	$smarty->assign( 'allTrans', 1 );
+	$gBitSmarty->assign( 'allTrans', 1 );
 }
 
 if( !empty( $_REQUEST['un_trans'] ) ) {
-	$smarty->assign( 'unTrans', 1 );
+	$gBitSmarty->assign( 'unTrans', 1 );
 }
 
 
 if( !empty( $_REQUEST['clear_cache'] ) ) {
 	$gBitLanguage->clearCache();
-	$smarty->assign( 'saveSuccess', tra( 'System template and language cache have been cleared.' ) );
+	$gBitSmarty->assign( 'saveSuccess', tra( 'System template and language cache have been cleared.' ) );
 } elseif( !empty( $_REQUEST['translate'] ) ) {
 	$editLang = $_REQUEST['lang'];
-	$smarty->assign( 'lang', $editLang );
-	$smarty->assign( 'translate', TRUE );
+	$gBitSmarty->assign( 'lang', $editLang );
+	$gBitSmarty->assign( 'translate', TRUE );
 	if( !empty( $_REQUEST['hash'] ) ) {
 		$tranStrings = $gBitLanguage->getTranslationString( $_REQUEST['hash'], $editLang );
-		$smarty->assign_by_ref('tranStrings', $tranStrings );
+		$gBitSmarty->assign_by_ref('tranStrings', $tranStrings );
 	} else {
 		$gBitLanguage->loadLanguage( $editLang );
 		$tranStr = $gBitLanguage->mStrings[$editLang];
@@ -59,8 +59,8 @@ if( !empty( $_REQUEST['clear_cache'] ) ) {
 				}
 			}
 		}
-		$smarty->assign( 'char', empty( $_REQUEST['char'] ) ? '' : $_REQUEST['char'] );
-		$smarty->assign_by_ref( 'tranStrings', $tranStrings );
+		$gBitSmarty->assign( 'char', empty( $_REQUEST['char'] ) ? '' : $_REQUEST['char'] );
+		$gBitSmarty->assign_by_ref( 'tranStrings', $tranStrings );
 	}
 } elseif( isset($_REQUEST["delete_language"] ) ) {
 	if( $gBitUser->hasPermission( 'bit_p_delete_languages' ) ) {
@@ -81,20 +81,20 @@ if( !empty( $_REQUEST['clear_cache'] ) ) {
 } elseif( isset($_REQUEST["save_language"] ) ) {
 	if( $gBitLanguage->storeLanguage( $_REQUEST ) ) {
 		$languages = $gBitLanguage->listLanguages();
-		$smarty->assign( 'saveSuccess', tra( 'The language has been saved.' ) );
-		$smarty->assign_by_ref( 'defaults', $_REQUEST );
+		$gBitSmarty->assign( 'saveSuccess', tra( 'The language has been saved.' ) );
+		$gBitSmarty->assign_by_ref( 'defaults', $_REQUEST );
 	} else {
-		$smarty->assign_by_ref( 'saveErrors', $gBitLanguage->mErrors );
-		$smarty->assign_by_ref( 'defaults', $_REQUEST );
-		$smarty->assign( 'editDescription', TRUE );
+		$gBitSmarty->assign_by_ref( 'saveErrors', $gBitLanguage->mErrors );
+		$gBitSmarty->assign_by_ref( 'defaults', $_REQUEST );
+		$gBitSmarty->assign( 'editDescription', TRUE );
 	}
 } elseif( isset($_REQUEST["new_language"] ) ) {
-	$smarty->assign( 'editDescription', TRUE );
+	$gBitSmarty->assign( 'editDescription', TRUE );
 } elseif( isset($_REQUEST["edit_language"] ) ) {
 	if( !empty( $languages[$_REQUEST['lang']] ) ) {
-		$smarty->assign_by_ref( 'defaults', $languages[$_REQUEST['lang']] );
+		$gBitSmarty->assign_by_ref( 'defaults', $languages[$_REQUEST['lang']] );
 	}
-	$smarty->assign( 'editDescription', TRUE );
+	$gBitSmarty->assign( 'editDescription', TRUE );
 } elseif( !empty( $_REQUEST['save_translations'] ) ) {
 	$editLang = $_REQUEST['lang'];
 	$gBitLanguage->loadLanguage( $editLang );
@@ -109,10 +109,10 @@ if( !empty( $_REQUEST['clear_cache'] ) ) {
 		}
 	}
 	$tranStrings = $gBitLanguage->getTranslationString( $sourceHash, $editLang );
-	$smarty->assign_by_ref('tranStrings', $tranStrings );
-	$smarty->assign( 'lang', $editLang );
-	$smarty->assign( 'translate', TRUE );
-	$smarty->assign( 'saveSuccess', $saveSuccess );
+	$gBitSmarty->assign_by_ref('tranStrings', $tranStrings );
+	$gBitSmarty->assign( 'lang', $editLang );
+	$gBitSmarty->assign( 'translate', TRUE );
+	$gBitSmarty->assign( 'saveSuccess', $saveSuccess );
 }
 
 $gBitSystem->display( 'bitpackage:languages/edit_languages.tpl');
diff --git a/import.php b/import.php
index ce8bc59..e65abcc 100644
--- a/import.php
+++ b/import.php
@@ -1,6 +1,6 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_languages/import.php,v 1.2 2005/07/17 17:36:07 squareing Exp $
+// $Header: /cvsroot/bitweaver/_bit_languages/import.php,v 1.3 2005/08/01 18:40:39 squareing Exp $
 
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See copyright.txt for details and a complete list of authors.
@@ -20,15 +20,15 @@ foreach( array_keys($impLanguages) as $langCode ) {
 		unset( $impLanguages[$langCode] );
 	}
 }
-$smarty->assign_by_ref('impLanguages', $impLanguages );
+$gBitSmarty->assign_by_ref('impLanguages', $impLanguages );
 
 // Get languages that can be exported
 $expLanguages = $gBitLanguage->getImportedLanguages();
-$smarty->assign_by_ref('expLanguages', $expLanguages );
+$gBitSmarty->assign_by_ref('expLanguages', $expLanguages );
 
 if (isset($_REQUEST["exp_language"])) {
 	$exp_language = $_REQUEST["exp_language"];
-	$smarty->assign('exp_language', $exp_language);
+	$gBitSmarty->assign('exp_language', $exp_language);
 }
 
 // Import
@@ -79,7 +79,7 @@ if (isset($_REQUEST["import"])) {
 	}
 }
 
-$smarty->assign('impmsg', $impMsg);
+$gBitSmarty->assign('impmsg', $impMsg);
 
 $gBitSystem->display( 'bitpackage:languages/import_languages.tpl');
 
diff --git a/lang/de/language.php b/lang/de/language.php
index d8d3c2f..253c9b9 100644
--- a/lang/de/language.php
+++ b/lang/de/language.php
@@ -236,7 +236,7 @@ $lang=Array(
 'Admin instance' => 'Admin Instanzen',
 'Administer Group' => '',
 'Administer phpBB ' => '',
-'Administer phpBB {$smarty.session.sid}' => '',
+'Administer phpBB {$gBitSmarty.session.sid}' => '',
 'Administration' => 'Administration',
 'Administration Features' => 'Administrative Einstellungen',
 'Administration Menu' => 'Admin-Menü',
@@ -262,7 +262,7 @@ $lang=Array(
 'Admin newsletter subscriptions' => 'Admin Newsletter-Abonnenten',
 'admin notifications tpl' => '',
 'Admin. phpBB' => 'phpBB administrieren',
-'Admin. phpBB {$smarty.session.sid}' => 'phpBB administrieren {$smarty.session.sid}',
+'Admin. phpBB {$gBitSmarty.session.sid}' => 'phpBB administrieren {$gBitSmarty.session.sid}',
 'Admin Polls' => 'Admin Abstimmungen',
 'admin polls template' => '',
 'admin polls tpl' => '',
diff --git a/lang/fr/language.php b/lang/fr/language.php
index 6658245..7b9fb03 100644
--- a/lang/fr/language.php
+++ b/lang/fr/language.php
@@ -236,7 +236,7 @@ $lang=Array(
 'Admin instance' => 'Administrer une instance',
 'Administer Group' => '',
 'Administer phpBB ' => 'Administrer phpBB',
-'Administer phpBB {$smarty.session.sid}' => 'Administrer phpBB {$smarty.session.sid}',
+'Administer phpBB {$gBitSmarty.session.sid}' => 'Administrer phpBB {$gBitSmarty.session.sid}',
 'Administration' => 'Administration',
 'Administration Features' => 'Fonctionnalités administrateur',
 'Administration Menu' => 'Administration Menu',
@@ -262,7 +262,7 @@ $lang=Array(
 'Admin newsletter subscriptions' => 'Administrer les inscriptions à une newsletter',
 'admin notifications tpl' => 'Tpl de l\'administration des notifications',
 'Admin. phpBB' => '',
-'Admin. phpBB {$smarty.session.sid}' => '',
+'Admin. phpBB {$gBitSmarty.session.sid}' => '',
 'Admin Polls' => 'administrer les sondages',
 'admin polls template' => '',
 'admin polls tpl' => 'Tpl de l\'administration des sondages',
diff --git a/lang/no/language.php b/lang/no/language.php
index 6085438..f9f31cc 100644
--- a/lang/no/language.php
+++ b/lang/no/language.php
@@ -236,7 +236,7 @@ $lang=Array(
 'Admin instance' => 'Admin instance',
 'Administer Group' => 'Administrer Gruppe',
 'Administer phpBB ' => 'Administrer phpBB',
-'Administer phpBB {$smarty.session.sid}' => 'Administrer phpBB {$smarty.session.sid}',
+'Administer phpBB {$gBitSmarty.session.sid}' => 'Administrer phpBB {$gBitSmarty.session.sid}',
 'Administration' => 'Administrasjon',
 'Administration Features' => '',
 'Administration Menu' => 'Administrasjonsmeny',
@@ -262,7 +262,7 @@ $lang=Array(
 'Admin newsletter subscriptions' => 'Admin newsletter subscriptions',
 'admin notifications tpl' => '',
 'Admin. phpBB' => 'Administrer phpBB',
-'Admin. phpBB {$smarty.session.sid}' => 'Administrer phpBB {$smarty.session.sid}',
+'Admin. phpBB {$gBitSmarty.session.sid}' => 'Administrer phpBB {$gBitSmarty.session.sid}',
 'Admin Polls' => 'Admin Polls',
 'admin polls template' => '',
 'admin polls tpl' => '',
diff --git a/master_strings.php b/master_strings.php
index da57dad..9fe1f11 100644
--- a/master_strings.php
+++ b/master_strings.php
@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/bitweaver/_bit_languages/master_strings.php,v 1.1 2005/06/19 04:54:46 bitweaver Exp $
+// $Header: /cvsroot/bitweaver/_bit_languages/master_strings.php,v 1.2 2005/08/01 18:40:39 squareing Exp $
 // Copyright (c) 2005, bitweaver.org
 // All Rights Reserved. See copyright.txt for details and a complete list of authors.
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
@@ -8,7 +8,7 @@ require_once( '../bit_setup_inc.php' );
 
 $gBitSystem->verifyPermission( 'bit_p_edit_master_strings' );
 
-$smarty->assign_by_ref( 'languages', $gBitLanguage->listLanguages() );
+$gBitSmarty->assign_by_ref( 'languages', $gBitLanguage->listLanguages() );
 
 if( !empty( $_REQUEST['change_master'] ) ) {
 	$newSourceHash = $gBitLanguage->getSourceHash( $_REQUEST['edit_master'] );
@@ -22,9 +22,9 @@ if( !empty( $_REQUEST['change_master'] ) ) {
 		}
 	}
 	$gBitLanguage->loadMasterStrings( $_REQUEST['source_hash'] );
-	$smarty->assign_by_ref( 'masterStrings', $gBitLanguage->mStrings['master'] );
-	$smarty->assign_by_ref( 'tranStrings', $gBitLanguage->getTranslatedStrings( $_REQUEST['source_hash'] ) );
-	$smarty->assign( 'sourceHash', $_REQUEST['source_hash'] );
+	$gBitSmarty->assign_by_ref( 'masterStrings', $gBitLanguage->mStrings['master'] );
+	$gBitSmarty->assign_by_ref( 'tranStrings', $gBitLanguage->getTranslatedStrings( $_REQUEST['source_hash'] ) );
+	$gBitSmarty->assign( 'sourceHash', $_REQUEST['source_hash'] );
 } elseif( !empty( $_REQUEST['delete_master'] ) && !empty( $_REQUEST['source_hash'] ) ) {
 	if( empty( $_REQUEST['confirm'] ) ) {
 		$gBitSystem->setBrowserTitle( tra( 'Confirm Delete' ) );
@@ -39,9 +39,9 @@ if( !empty( $_REQUEST['change_master'] ) ) {
 		die;
 	} else {
 		if( $gBitLanguage->expungeMasterString( $_REQUEST['source_hash'] ) ) {
-			$smarty->assign( 'successMsg', 'The master string was deleted successfully.' );
+			$gBitSmarty->assign( 'successMsg', 'The master string was deleted successfully.' );
 		} else {
-			$smarty->assign( 'errorMsg', 'The master string could not be deleted.' );
+			$gBitSmarty->assign( 'errorMsg', 'The master string could not be deleted.' );
 		}
 	}
 } elseif( !empty( $_REQUEST['guess_translations'] ) ) {
@@ -50,7 +50,7 @@ if( !empty( $_REQUEST['change_master'] ) ) {
 	if( strlen( $masterStrings[$_REQUEST['source_hash']]['source'] ) > 70 ) {
 		$masterStrings[$_REQUEST['source_hash']]['textarea'] = TRUE;
 	}
-	$smarty->assign_by_ref( 'masterStrings', $masterStrings );
+	$gBitSmarty->assign_by_ref( 'masterStrings', $masterStrings );
 	$masterString = $gBitLanguage->mStrings['master'][$_REQUEST['source_hash']];
 	$tranArray = array( 'de', 'es', 'fr', 'it', 'pt', 'ja', 'ko', 'zh-CN' );
 	$tranStrings = array();
@@ -71,11 +71,11 @@ if( !empty( $_REQUEST['change_master'] ) ) {
 			}
 		}
 	}
-	$smarty->assign( 'sourceHash', $_REQUEST['source_hash'] );
-	$smarty->assign_by_ref( 'tranStrings', $tranStrings );
+	$gBitSmarty->assign( 'sourceHash', $_REQUEST['source_hash'] );
+	$gBitSmarty->assign_by_ref( 'tranStrings', $tranStrings );
 } elseif( !empty( $_REQUEST['save_translations'] ) ) {
 	$tranStrings = $gBitLanguage->getTranslatedStrings( $_REQUEST['source_hash'] );
-	$smarty->assign( 'source_hash', $_REQUEST['source_hash'] );
+	$gBitSmarty->assign( 'source_hash', $_REQUEST['source_hash'] );
 	$sourceHash = $_REQUEST['source_hash'];
 	foreach( $_REQUEST['edit_trans'] as $langCode => $string ) {
 		// store if (We had a string and it is now empty) or ( we have a new string and it is different from before)
@@ -92,11 +92,11 @@ if( !empty( $_REQUEST['change_master'] ) ) {
 	if( strlen( $masterStrings[$_REQUEST['source_hash']]['source'] ) > 70 ) {
 		$masterStrings[$_REQUEST['source_hash']]['textarea'] = TRUE;
 	}
-	$smarty->assign_by_ref( 'masterStrings', $masterStrings );
-	$smarty->assign_by_ref( 'tranStrings', $gBitLanguage->getTranslatedStrings( $_REQUEST['source_hash'] ) );
-	$smarty->assign( 'sourceHash', $_REQUEST['source_hash'] );
+	$gBitSmarty->assign_by_ref( 'masterStrings', $masterStrings );
+	$gBitSmarty->assign_by_ref( 'tranStrings', $gBitLanguage->getTranslatedStrings( $_REQUEST['source_hash'] ) );
+	$gBitSmarty->assign( 'sourceHash', $_REQUEST['source_hash'] );
 } elseif( !empty( $_REQUEST['find'] ) && !empty( $_REQUEST['search'] ) ) {
-	$smarty->assign_by_ref( 'masterStrings', $gBitLanguage->searchMasterStrings( $_REQUEST['find'] ) );
+	$gBitSmarty->assign_by_ref( 'masterStrings', $gBitLanguage->searchMasterStrings( $_REQUEST['find'] ) );
 } else {
 	$gBitLanguage->loadMasterStrings();
 	// work out what strings to display
@@ -117,11 +117,11 @@ if( !empty( $_REQUEST['change_master'] ) ) {
 			$masterStrings[$key] = $master;
 		}
 	}
-	$smarty->assign( 'char', empty( $_REQUEST['char'] ) ? '' : $_REQUEST['char'] );
-	$smarty->assign_by_ref( 'masterStrings', $masterStrings );
+	$gBitSmarty->assign( 'char', empty( $_REQUEST['char'] ) ? '' : $_REQUEST['char'] );
+	$gBitSmarty->assign_by_ref( 'masterStrings', $masterStrings );
 }
 
 // Display the template
-$smarty->assign_by_ref( 'masterMsg', $masterMsg );
+$gBitSmarty->assign_by_ref( 'masterMsg', $masterMsg );
 $gBitSystem->display( 'bitpackage:languages/language_master_strings.tpl', 'Edit Master Strings' );
 ?>
diff --git a/modules/mod_switch_language_dropdown.php b/modules/mod_switch_language_dropdown.php
index bc0c2d7..57f4e51 100644
--- a/modules/mod_switch_language_dropdown.php
+++ b/modules/mod_switch_language_dropdown.php
@@ -5,8 +5,8 @@ global $gBitLanguage, $gBitUser;
 //vd($_COOKIE);
 //vd($_SESSION);
 $sel_lang = !empty( $gBitUser->mInfo['bitlanguage'] ) ? $gBitUser->mInfo['bitlanguage'] : $gBitLanguage->mLanguage;
-$smarty->assign( 'sel_lang', $sel_lang );
+$gBitSmarty->assign( 'sel_lang', $sel_lang );
 $languages = array();
 $languages = $gBitLanguage->listLanguages( FALSE );
-$smarty->assign_by_ref('languages', $languages);
+$gBitSmarty->assign_by_ref('languages', $languages);
 ?>
diff --git a/modules/mod_switch_language_links.php b/modules/mod_switch_language_links.php
index d2b798a..8b22ff8 100644
--- a/modules/mod_switch_language_links.php
+++ b/modules/mod_switch_language_links.php
@@ -1,8 +1,8 @@
 <?php
 global $gBitLanguage;
 $sel_lang = !empty( $gBitUser->mInfo['bitlanguage'] ) ? $gBitUser->mInfo['bitlanguage'] : $gBitLanguage->mLanguage;
-$smarty->assign( 'sel_lang', $sel_lang );
+$gBitSmarty->assign( 'sel_lang', $sel_lang );
 $languages = array();
 $languages = $gBitLanguage->listLanguages( FALSE );
-$smarty->assign_by_ref('languages', $languages);
+$gBitSmarty->assign_by_ref('languages', $languages);
 ?>
diff --git a/templates/babelfish.tpl b/templates/babelfish.tpl
index 98d1f53..677496b 100644
--- a/templates/babelfish.tpl
+++ b/templates/babelfish.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_languages/templates/babelfish.tpl,v 1.2 2005/07/17 17:36:08 squareing Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_languages/templates/babelfish.tpl,v 1.3 2005/08/01 18:40:46 squareing Exp $ *}
 
 {if $gBitSystem->isFeatureActive( 'feature_babelfish' ) and $gBitSystem->isFeatureActive( 'feature_babelfish_logo' )}
 
@@ -23,7 +23,7 @@
 </table>
 </div>
 
-{elseif $gBitSystem->isFeatureActive( 'feature_babelfish' ) and !$gBitSystemPrefs->isFeatureActive( 'feature_babelfish_logo' )}
+{elseif $gBitSystem->isFeatureActive( 'feature_babelfish' ) and !$gBitSystem->isFeatureActive( 'feature_babelfish_logo' )}
 
 <div class="babelfish">
 <table>
@@ -35,7 +35,7 @@
 </table>
 </div>
 
-{elseif !$gBitSystem->isFeatureActive( 'feature_babelfish' ) and $gBitSystemPrefs->isFeatureActive( 'feature_babelfish_logo' )}
+{elseif !$gBitSystem->isFeatureActive( 'feature_babelfish' ) and $gBitSystem->isFeatureActive( 'feature_babelfish_logo' )}
 
 <div class="babelfish">
   {$babelfish_logo}