From ca8fc998b5d7be7fbffbcd3ab18c90b75a206433 Mon Sep 17 00:00:00 2001
From: spiderr <spider@viovio.com>
Date: Thu, 18 Apr 2013 11:14:20 -0400
Subject: tweak menu to display title link only when passed var

---
 templates/center_list_newsletters.php | 24 +++++++++++-------------
 templates/menu_newsletters.tpl        |  2 +-
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/templates/center_list_newsletters.php b/templates/center_list_newsletters.php
index 853fe6e..c727003 100644
--- a/templates/center_list_newsletters.php
+++ b/templates/center_list_newsletters.php
@@ -6,23 +6,21 @@ global $gBitSystem, $gBitUser;
 $gBitSystem->verifyPackage( 'newsletters' );
 
 if( !$gBitUser->isRegistered() && !$gBitUser->hasPermission( 'p_newsletters_subscribe' ) && empty( $_REQUEST["sub"] ) ) {
-	$gBitSystem->fatalError( tra("You must be logged in to subscribe to newsletters"));
-}
-
-require_once( NEWSLETTERS_PKG_PATH.'lookup_newsletter_inc.php' );
 
-/* List newsletters */
-$listHash = array();
+	require_once( NEWSLETTERS_PKG_PATH.'lookup_newsletter_inc.php' );
 
-$newsletters = BitNewsletter::getList( $listHash );
-foreach( array_keys( $newsletters ) as $contentId ) {
-	$listHash = array( 'nl_id' => $newsletters[$contentId]['nl_id']  );
-	$newsletters[$contentId]['editions'] = BitNewsletterEdition::getList( $listHash );
-}
+	/* List newsletters */
+	$listHash = array();
 
-$gBitSmarty->assign_by_ref( 'subs', BitNewsletter::getUserSubscriptions( $gBitUser->getField( 'user_id' ), $gBitUser->getField( 'email' ) ) );
-$gBitSmarty->assign_by_ref('newsletters', $newsletters );
+	$newsletters = BitNewsletter::getList( $listHash );
+	foreach( array_keys( $newsletters ) as $contentId ) {
+		$listHash = array( 'nl_id' => $newsletters[$contentId]['nl_id']  );
+		$newsletters[$contentId]['editions'] = BitNewsletterEdition::getList( $listHash );
+	}
 
+	$gBitSmarty->assign_by_ref( 'subs', BitNewsletter::getUserSubscriptions( $gBitUser->getField( 'user_id' ), $gBitUser->getField( 'email' ) ) );
+	$gBitSmarty->assign_by_ref('newsletters', $newsletters );
 
+}
 
 ?>
diff --git a/templates/menu_newsletters.tpl b/templates/menu_newsletters.tpl
index 97dab86..6c965b2 100644
--- a/templates/menu_newsletters.tpl
+++ b/templates/menu_newsletters.tpl
@@ -1,5 +1,5 @@
 {strip}
-<a class="dropdown-toggle" data-toggle="dropdown" href="#"> {tr}{$packageMenuTitle}{/tr} <b class="caret"></b></a>
+{if $packageMenuTitle}<a class="dropdown-toggle" data-toggle="dropdown" href="#"> {tr}{$packageMenuTitle}{/tr} <b class="caret"></b></a>{/if}
 <ul class="{$packageMenuClass}">
 	<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php">{booticon iname="icon-list" iexplain="List Newsletters" ilocation=menu}</a></li>
 	{if $gBitUser->hasPermission( 'p_newsletters_create' )}
-- 
cgit v1.3