merge recent changes from R1 to HEAD

3 files changed, 16 insertions, 4 deletions

diff --git a/modules/mod_switch_language_dropdown.php b/modules/mod_switch_language_dropdown.php
index 57f4e51..19d197d 100644
--- a/modules/mod_switch_language_dropdown.php
+++ b/modules/mod_switch_language_dropdown.php
@@ -1,6 +1,11 @@
 <?php
-// setup has already set the $language variable
-//Create a list of languages
+/**
+ * Create a list of languages
+ *
+ * @package languages
+ * @subpackage modules
+ * @version $Header: /cvsroot/bitweaver/_bit_languages/modules/mod_switch_language_dropdown.php,v 1.6 2006/01/10 21:13:02 squareing Exp $
+ */ 
 global $gBitLanguage, $gBitUser;
 //vd($_COOKIE);
 //vd($_SESSION);
diff --git a/modules/mod_switch_language_links.php b/modules/mod_switch_language_links.php
index 8b22ff8..e02047f 100644
--- a/modules/mod_switch_language_links.php
+++ b/modules/mod_switch_language_links.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Create a language link
+ *
+ * @package languages
+ * @subpackage modules
+ * @version $Header: /cvsroot/bitweaver/_bit_languages/modules/mod_switch_language_links.php,v 1.6 2006/01/10 21:13:02 squareing Exp $
+ */ 
 global $gBitLanguage;
 $sel_lang = !empty( $gBitUser->mInfo['bitlanguage'] ) ? $gBitUser->mInfo['bitlanguage'] : $gBitLanguage->mLanguage;
 $gBitSmarty->assign( 'sel_lang', $sel_lang );
diff --git a/modules/mod_switch_language_links.tpl b/modules/mod_switch_language_links.tpl
index f75f0aa..45b3b02 100644
--- a/modules/mod_switch_language_links.tpl
+++ b/modules/mod_switch_language_links.tpl
@@ -1,10 +1,10 @@
-{* $Header: /cvsroot/bitweaver/_bit_languages/modules/mod_switch_language_links.tpl,v 1.1 2005/06/19 04:55:13 bitweaver Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_languages/modules/mod_switch_language_links.tpl,v 1.2 2005/08/07 17:39:28 squareing Exp $ *}
 {strip}
 {bitmodule title="$moduleTitle" name="switch_language_links"}
 	{foreach from=$languages item=lang key=langCode}
 		{if is_disabled ne 'y'}
 			<span {if $sel_lang eq $langCode}class="highlight"{/if} style="display:bock;width:33%;float:left;">
-				<a title="{$lang.native_name} ({$lang.translated_name})" href="{$gBitLoc.LANGUAGES_PKG_URL}switch_lang.php?language={$langCode}">{$lang.lang_code}</a>
+				<a title="{$lang.native_name} ({$lang.translated_name})" href="{$smarty.const.LANGUAGES_PKG_URL}switch_lang.php?language={$langCode}">{$lang.lang_code}</a>
 			</span>
 		{/if}
 	{/foreach}