[Tikiwiki-cvs] tiki/templates tiki-top_bar.tpl,1.41.2.6,1.41.2.7

[<sy...@us...>]

Update of /cvsroot/tikiwiki/tiki/templates
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17390/templates

Modified Files:
      Tag: BRANCH-1-10
	tiki-top_bar.tpl 
Log Message:
[FIX]topbar: do not display topbar if feature_topbar is n even if feature_topbar_xx is y

Index: tiki-top_bar.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-top_bar.tpl,v
retrieving revision 1.41.2.6
retrieving revision 1.41.2.7
diff -u -d -r1.41.2.6 -r1.41.2.7
--- tiki-top_bar.tpl	23 Dec 2007 17:11:21 -0000	1.41.2.6
+++ tiki-top_bar.tpl	29 Feb 2008 14:58:45 -0000	1.41.2.7
@@ -1,5 +1,5 @@
 {* $Header$ *}
-{if $prefs.feature_siteidentity eq 'y'}
+{if $prefs.feature_siteidentity eq 'y' && $prefs.feature_topbar eq 'y'}
 {if $prefs.feature_topbar_version eq 'y'}
 {tr}This is{/tr} Tikiwiki v{$tiki_version} {if $tiki_uses_cvs eq 'y'} (CVS){/if} -{$tiki_star}- &#169; 2002&#8211;2007 {tr}by the{/tr} <a href="http://tikiwiki.org" 
 title="tikiwiki.org">{tr}Tiki community{/tr}</a>