diff options
| -rw-r--r-- | BitBlog.php | 2 | ||||
| -rw-r--r-- | BitBlogPost.php | 8 | ||||
| -rw-r--r-- | templates/user_watch_blog_post.tpl | 2 | ||||
| -rw-r--r-- | templates/view_blog.tpl | 4 | ||||
| -rw-r--r-- | view.php | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/BitBlog.php b/BitBlog.php index e3a30e7..024affc 100644 --- a/BitBlog.php +++ b/BitBlog.php @@ -178,7 +178,7 @@ class BitBlog extends BitBase { function add_blog_hit($blog_id) { global $gBitUser, $gBitSystem; - if ( $this->verifyId( $blog_id ) && ($gBitSystem->isFeatureActive( 'count_admin_pvs' ) || !$gBitUser->isAdmin()) ){ + if ( $this->verifyId( $blog_id ) && ($gBitSystem->isFeatureActive( 'users_count_admin_pageviews' ) || !$gBitUser->isAdmin()) ){ $bindvars = array( $blog_id ); $ownerSql = ''; if( $gBitUser->isValid() ) { diff --git a/BitBlogPost.php b/BitBlogPost.php index 495907f..1c18b89 100644 --- a/BitBlogPost.php +++ b/BitBlogPost.php @@ -1,12 +1,12 @@ <?php /** - * $Header: /cvsroot/bitweaver/_bit_blogs/BitBlogPost.php,v 1.26 2006/04/19 13:48:37 squareing Exp $ + * $Header: /cvsroot/bitweaver/_bit_blogs/BitBlogPost.php,v 1.27 2006/04/19 16:45:06 spiderr Exp $ * * Copyright (c) 2004 bitweaver.org * All Rights Reserved. See copyright.txt for details and a complete list of authors. * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details * - * $Id: BitBlogPost.php,v 1.26 2006/04/19 13:48:37 squareing Exp $ + * $Id: BitBlogPost.php,v 1.27 2006/04/19 16:45:06 spiderr Exp $ * * Virtual base class (as much as one can have such things in PHP) for all * derived tikiwiki classes that require database access. @@ -16,7 +16,7 @@ * * @author drewslater <andrew@andrewslater.com>, spiderr <spider@steelsun.com> * - * @version $Revision: 1.26 $ $Date: 2006/04/19 13:48:37 $ $Author: squareing $ + * @version $Revision: 1.27 $ $Date: 2006/04/19 16:45:06 $ $Author: spiderr $ */ /** @@ -211,7 +211,7 @@ class BitBlogPost extends LibertyAttachable { // let's reload to get a full mInfo hash which is needed below $this->load(); - if( $gBitSystem->isFeatureActive( 'user_watches' ) ) { + if( $gBitSystem->isFeatureActive( 'users_watches' ) ) { global $gBitUser; if( $nots = $gBitUser->getEventWatches( 'blog_post', $this->mInfo['blog_id'] ) ) { foreach ($nots as $not) { diff --git a/templates/user_watch_blog_post.tpl b/templates/user_watch_blog_post.tpl index dc91202..ffdf3d2 100644 --- a/templates/user_watch_blog_post.tpl +++ b/templates/user_watch_blog_post.tpl @@ -4,5 +4,5 @@ {$mail_machine_raw}/{$smarty.const.BLOGS_PKG_URL}view_post.php?blog_id={$mail_blogid}&post_id={$mail_postid} {tr}If you don't want to receive these notifications follow this link:{/tr} -{$mail_machine_raw}/{$smarty.const.USERS_PKG_URL}user_watches.php?hash={$mail_hash} +{$mail_machine_raw}/{$smarty.const.USERS_PKG_URL}watches.php?hash={$mail_hash} diff --git a/templates/view_blog.tpl b/templates/view_blog.tpl index 1aa864f..f8ba76a 100644 --- a/templates/view_blog.tpl +++ b/templates/view_blog.tpl @@ -1,4 +1,4 @@ -{* $Header: /cvsroot/bitweaver/_bit_blogs/templates/view_blog.tpl,v 1.9 2006/04/11 13:03:38 squareing Exp $ *} +{* $Header: /cvsroot/bitweaver/_bit_blogs/templates/view_blog.tpl,v 1.10 2006/04/19 16:45:08 spiderr Exp $ *} {strip} <div class="display blogs"> <div class="floaticon"> @@ -16,7 +16,7 @@ <a title="{tr}Edit blog{/tr}" href="{$smarty.const.BLOGS_PKG_URL}edit.php?blog_id={$blog_id}">{biticon ipackage=liberty iname="config" iexplain="edit"}</a> {/if} - {if $gBitUser->isRegistered() and $gBitSystem->isFeatureActive( 'user_watches' )} + {if $gBitUser->isRegistered() and $gBitSystem->isFeatureActive( 'users_watches' )} {if $user_watching_blog eq 'n'} <a title="{tr}monitor this blog{/tr}" href="{$smarty.const.BLOGS_PKG_URL}view.php?blog_id={$blog_id}&watch_event=blog_post&watch_object={$blog_id}&watch_action=add">{biticon ipackage="users" iname="watch" iexplain="monitor this blog"}</a> {else} @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_blogs/view.php,v 1.15 2006/04/11 13:03:37 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_blogs/view.php,v 1.16 2006/04/19 16:45:06 spiderr Exp $ * @package blogs * @subpackage functions @@ -179,7 +179,7 @@ if( $gBitSystem->isPackageActive( 'notepad' ) && $gBitUser->hasPermission( 'bit_ } } -if( $gBitSystem->isFeatureActive( 'user_watches' ) ) { +if( $gBitSystem->isFeatureActive( 'users_watches' ) ) { if( $gBitUser->isValid() && isset( $_REQUEST['watch_event'] ) ) { if ($_REQUEST['watch_action'] == 'add') { |