summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x[-rw-r--r--]templates/calendar.tpl2
-rwxr-xr-x[-rw-r--r--]templates/calendar_box.tpl2
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/calendar.tpl b/templates/calendar.tpl
index 34f3041..6297d00 100644..100755
--- a/templates/calendar.tpl
+++ b/templates/calendar.tpl
@@ -117,7 +117,7 @@
{/if}
</table>
{/jstab}
- {if $gBitUser->hasPermission('p_calendar_view') && !empty($calContentTypes)}
+ {if $gBitUser->hasPermission('p_calendar_view') and !empty($calContentTypes)}
{jstab title="Display Options"}
{include file="bitpackage:calendar/calendar_options_inc.tpl"}
{/jstab}
diff --git a/templates/calendar_box.tpl b/templates/calendar_box.tpl
index 10893df..aa79bb1 100644..100755
--- a/templates/calendar_box.tpl
+++ b/templates/calendar_box.tpl
@@ -8,7 +8,7 @@
{if !empty($cellHash.rendered)}
{$cellHash.rendered}
{/if}
- {if $gBitUser->hasPermission('p_calendar_view_changes') && !empty($cellHash.creator_real_name) }
+ {if $gBitUser->hasPermission('p_calendar_view_changes') and !empty($cellHash.creator_real_name) }
<div class="boxcontent">
{tr}Content Type{/tr}: {$gLibertySystem->getContentTypeName($cellHash.content_type_guid)}