Commit 838c0eab authored by amette's avatar amette

Check for tiki_p_freetag_tag/view

parent 902ffaa2
<?php
// $Header: /cvsroot/tikiwiki/tiki/freetag_apply.php,v 1.3 2005-12-06 20:10:53 lfagundes Exp $
// $Header: /cvsroot/tikiwiki/tiki/freetag_apply.php,v 1.4 2005-12-16 00:05:45 amette Exp $
// Copyright (c) 2002-2005, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
......@@ -11,8 +11,9 @@ require_once('tiki-setup.php');
$access->check_script($_SERVER["SCRIPT_NAME"],basename(__FILE__));
global $feature_freetags;
global $tiki_p_freetags_tag;
if ($feature_freetags == 'y') {
if ($feature_freetags == 'y' and $tiki_p_freetags_tag == 'y') {
global $freetaglib;
if (!is_object($freetaglib)) {
......
<?php
// $Header: /cvsroot/tikiwiki/tiki/freetag_list.php,v 1.2 2005-12-15 16:42:51 lfagundes Exp $
// $Header: /cvsroot/tikiwiki/tiki/freetag_list.php,v 1.3 2005-12-16 00:05:45 amette Exp $
// Copyright (c) 2002-2005, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
......@@ -12,8 +12,9 @@ require_once('tiki-setup.php');
$access->check_script($_SERVER["SCRIPT_NAME"],basename(__FILE__));
global $feature_freetags;
global $tiki_p_view_freetags;
if ($feature_freetags == 'y') {
if ($feature_freetags == 'y' and $tiki_p_view_freetags == 'y') {
global $freetaglib;
if (!is_object($freetaglib)) {
......
......@@ -94,7 +94,7 @@ or use the image URL to include images using the WYSIWYG editor. {/tr}</small></
{if $blog_spellcheck eq 'y'}
<tr><td class="editblogform">{tr}Spellcheck{/tr}: </td><td class="editblogform"><input type="checkbox" name="spellcheck" {if $spellcheck eq 'y'}checked="checked"{/if} /></td></tr>
{/if}
{if $feature_freetags eq 'y'}
{if $feature_freetags eq 'y' and $tiki_p_freetags_tag eq 'y'}
{include file=freetag.tpl}
{/if}
<tr><td class="editblogform">&nbsp;</td><td class="editblogform"><input type="submit" class="wikiaction" name="save" value="{tr}save{/tr}" />
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-editpage.tpl,v 1.69 2005-12-02 18:49:22 lfagundes Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-editpage.tpl,v 1.70 2005-12-16 00:05:46 amette Exp $ *}
{popup_init src="lib/overlib.js"}
......@@ -193,7 +193,7 @@ or use
</td></tr>
{/if}
{/if}
{if $feature_freetags eq 'y'}
{if $feature_freetags eq 'y' and $tiki_p_freetags_tag eq 'y'}
{include file=freetag.tpl}
{/if}
{if $feature_wiki_allowhtml eq 'y' and $tiki_p_use_HTML eq 'y'}
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-show_page.tpl,v 1.93 2005-12-15 21:02:47 lfagundes Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-show_page.tpl,v 1.94 2005-12-16 00:05:46 amette Exp $ *}
{breadcrumbs type="trail" loc="page" crumbs=$crumbs}
{if $feature_page_title eq 'y'}
......@@ -84,7 +84,7 @@
</tr></table>
</div>
{if $freetags.data[0] and $feature_freetags eq 'y'}
{if $freetags.data[0] and $feature_freetags eq 'y' and $tiki_p_view_freetags eq 'y'}
<div class="freetaglist">
{foreach from=$freetags.data item=taginfo}
<a class="freetag" href="tiki-browse_freetags.php?tag={$taginfo.tag}">{$taginfo.tag}</a>
......
......@@ -80,7 +80,7 @@
{/if}
</td></tr></table>
</div>
{if $feature_freetag eq 'y'}
{if $feature_freetags eq 'y' and $tiki_p_view_freetags eq 'y'}
<div class="freetaglist">
{foreach from=$listpages[ix].freetags.data item=taginfo}
<a class="freetag" href="tiki-browse_freetags.php?tag={$taginfo.tag}">{$taginfo.tag}</a>
......
......@@ -18,7 +18,7 @@
{else}
<h3>{$post_info.created|tiki_short_datetime}</h3>
{/if}
{if $feature_freetags eq 'y'}
{if $feature_freetags eq 'y' and $tiki_p_view_freetags eq 'y'}
<div class="freetaglist">
{foreach from=$tags.data item=tag}
<a class="freetag" href="tiki-browse_freetags.php?tag={$tag.tag}">{$tag.tag}</a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment