diff options
| -rw-r--r-- | page_history.php | 12 | ||||
| -rw-r--r-- | templates/page_history.tpl | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/page_history.php b/page_history.php index c28f327..ac1c15f 100644 --- a/page_history.php +++ b/page_history.php @@ -1,6 +1,6 @@ <?php /** - * $Header: /cvsroot/bitweaver/_bit_wiki/page_history.php,v 1.24 2007/09/14 17:07:20 spiderr Exp $ + * $Header: /cvsroot/bitweaver/_bit_wiki/page_history.php,v 1.25 2007/10/03 07:00:13 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.24 2007/09/14 17:07:20 spiderr Exp $ + * $Id: page_history.php,v 1.25 2007/10/03 07:00:13 squareing Exp $ * @package wiki * @subpackage functions */ @@ -33,17 +33,17 @@ if( !$gContent->isValid() || empty( $gContent->mInfo ) ) { $gContent->verifyViewPermission(); $gContent->verifyPermission( 'p_wiki_view_history' ); -$page_id = $_REQUEST['page_id']; +// set up stuff to get history working $smartyContentRef = 'pageInfo'; +$rollbackPerm = 'p_wiki_rollback'; include_once( LIBERTY_PKG_PATH.'content_history_inc.php' ); // pagination stuff $gBitSmarty->assign( 'page', $page = !empty( $_REQUEST['page'] ) ? $_REQUEST['page'] : 1 ); -if ( !empty($_REQUEST['list_page']) ) { -$gBitSmarty->assign( 'page', $page = !empty( $_REQUEST['list_page'] ) ? $_REQUEST['list_page'] : 1 ); +if( !empty( $_REQUEST['list_page'] )) { + $gBitSmarty->assign( 'page', $page = !empty( $_REQUEST['list_page'] ) ? $_REQUEST['list_page'] : 1 ); } - $offset = ( $page - 1 ) * $gBitSystem->getConfig( 'max_records' ); $history = $gContent->getHistory( NULL, NULL, $offset, $gBitSystem->getConfig( 'max_records' ) ); $gBitSmarty->assign_by_ref( 'data', $history['data'] ); diff --git a/templates/page_history.tpl b/templates/page_history.tpl index b223092..473af9d 100644 --- a/templates/page_history.tpl +++ b/templates/page_history.tpl @@ -1,4 +1,4 @@ -{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/page_history.tpl,v 1.13 2007/08/25 02:26:05 laetzer Exp $ *} +{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/page_history.tpl,v 1.14 2007/10/03 07:00:13 squareing Exp $ *} {strip} <div class="admin wiki"> <div class="header"> @@ -81,7 +81,7 @@ • {smartlink ititle="Difference" page_id=`$gContent->mPageId` diff2=`$item.version`} • {smartlink ititle="Source" page_id=`$gContent->mPageId` source=`$item.version`} {if $gBitUser->hasPermission( 'p_wiki_rollback' )} - • {smartlink iurl="rollback.php" ititle="Rollback" page_id=`$gContent->mPageId` version=`$item.version`} + • {smartlink ititle="Rollback" page_id=`$gContent->mPageId` rollback=`$item.version`} {/if} </td> <td style="text-align:right;"> |