Merge recent changes from R1 to HEAD - never doing this again.

1 files changed, 5 insertions, 12 deletions

diff --git a/copyrights.php b/copyrights.php
index 139c2e6..6bd2536 100644
--- a/copyrights.php
+++ b/copyrights.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_wiki/copyrights.php,v 1.2 2005/06/28 07:46:27 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_wiki/copyrights.php,v 1.3 2005/07/17 17:36:45 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: copyrights.php,v 1.2 2005/06/28 07:46:27 spiderr Exp $
+ * $Id: copyrights.php,v 1.3 2005/07/17 17:36:45 squareing Exp $
  * @package wiki
  * @subpackage functions
  */
@@ -17,16 +17,9 @@
  * required setup
  */
 require_once( '../bit_setup_inc.php' );
-if ($wiki_feature_copyrights != 'y') {
-	$smarty->assign('msg', tra("The copyright management feature is not enabled."));
-	$gBitSystem->display( 'error.tpl' );
-	die;
-}
-if (!((isset($bit_p_edit_copyrights)) && ($gBitUser->hasPermission( 'bit_p_edit_copyrights' )))) {
-	$smarty->assign('msg', tra("You do not have permission to use this feature."));
-	$gBitSystem->display( 'error.tpl' );
-	die;
-}
+$gBitSystem->isFeatureActive( 'wiki_feature_copyrights', tra("The copyright management feature is not enabled.") );
+
+$gBitUser->hasPermission( 'bit_p_edit_copyrights' );
 require_once( WIKI_PKG_PATH.'copyrights_lib.php' );
 require_once( WIKI_PKG_PATH.'lookup_page_inc.php' );