replace old code with new versions - we need to stop babysitting outdated code

1 files changed, 4 insertions, 13 deletions

diff --git a/page_history.php b/page_history.php
index 504b39d..9ba8e16 100644
--- a/page_history.php
+++ b/page_history.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_wiki/page_history.php,v 1.4 2005/08/01 18:42:04 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_wiki/page_history.php,v 1.5 2006/01/27 21:57:53 squareing Exp $
  *
  * Copyright (c) 2004 bitweaver.org
  * Copyright (c) 2003 tikwiki.org
@@ -8,7 +8,7 @@
  * 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: page_history.php,v 1.4 2005/08/01 18:42:04 squareing Exp $
+ * $Id: page_history.php,v 1.5 2006/01/27 21:57:53 squareing Exp $
  * @package wiki
  * @subpackage functions
  */
@@ -20,11 +20,8 @@ require_once( '../bit_setup_inc.php' );
 include_once( WIKI_PKG_PATH.'BitPage.php');
 
 $gBitSystem->verifyPackage( 'wiki' );
-if ($feature_history != 'y') {
-	$gBitSmarty->assign('msg', tra("This feature is disabled").": feature_history");
-	$gBitSystem->display( 'error.tpl' );
-	exit;
-}
+$gBitSystem->verifyFeature( 'feature_history' );
+$gBitSystem->verifyPermission( 'bit_p_view', tra( "Permission denied you cannot browse this page history" ) );
 
 // Get the page from the request var or default it to HomePage
 include( WIKI_PKG_PATH.'lookup_page_inc.php' );
@@ -35,12 +32,6 @@ if( !$gContent->isValid() || empty( $gContent->mInfo ) ) {
 	$gBitSystem->fatalError( "Unknown page" );
 }
 
-// Now check permissions to access this page
-if (!$gBitUser->hasPermission( 'bit_p_view' )) {
-	$gBitSmarty->assign('msg', tra("Permission denied you cannot browse this page history"));
-	$gBitSystem->display( 'error.tpl' );
-	exit;
-}
 $gBitSmarty->assign('source', 0);
 // If we have to include a preview please show it
 $gBitSmarty->assign('preview', false);