merge recent changes with HEAD - R1 and HEAD are identical now

1 files changed, 14 insertions, 15 deletions

diff --git a/orphan_pages.php b/orphan_pages.php
index b8ff3bf..30265de 100644
--- a/orphan_pages.php
+++ b/orphan_pages.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_wiki/orphan_pages.php,v 1.3 2005/07/17 17:36:45 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_wiki/orphan_pages.php,v 1.4 2005/08/01 18:42:04 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: orphan_pages.php,v 1.3 2005/07/17 17:36:45 squareing Exp $
+ * $Id: orphan_pages.php,v 1.4 2005/08/01 18:42:04 squareing Exp $
  * @package wiki
  * @subpackage functions
  */
@@ -18,7 +18,6 @@
  */
 require_once( '../bit_setup_inc.php' );
 include_once( WIKI_PKG_PATH.'BitPage.php' );
-include_once( WIKI_PKG_PATH.'BitPage.php' );
 $BitPage = new BitPage();
 
 $gBitSystem->verifyPackage( 'wiki' );
@@ -60,7 +59,7 @@ if (isset($_REQUEST["submit_mult"]) && isset($_REQUEST["checked"]) && $_REQUEST[
 			}
 		}
 		if( !empty( $errors ) ) {
-			$smarty->assign_by_ref( 'errors', $errors );
+			$gBitSmarty->assign_by_ref( 'errors', $errors );
 		}
 	}
 }
@@ -73,7 +72,7 @@ if ( empty( $_REQUEST["sort_mode"] ) ) {
 } else {
 	$sort_mode = $_REQUEST["sort_mode"];
 }
-$smarty->assign_by_ref('sort_mode', $sort_mode);
+$gBitSmarty->assign_by_ref('sort_mode', $sort_mode);
 // If offset is set use it if not then use offset =0
 // use the maxRecords php variable to set the limit
 // if sortMode is not set then use last_modified_desc
@@ -86,34 +85,34 @@ if (isset($_REQUEST['page'])) {
 	$page = &$_REQUEST['page'];
 	$offset = ($page - 1) * $maxRecords;
 }
-$smarty->assign_by_ref('offset', $offset);
+$gBitSmarty->assign_by_ref('offset', $offset);
 if (isset($_REQUEST["find"])) {
 	$find = $_REQUEST["find"];
 } else {
 	$find = '';
 }
-$smarty->assign('find', $find);
+$gBitSmarty->assign('find', $find);
 // Get a list of last changes to the Wiki database
 $Content = new BitPage();
 $sort_mode = preg_replace( '/^user_/', 'creator_user_', $sort_mode );
 $listpages = $Content->getList( $offset, $maxRecords, $sort_mode, $find, NULL, TRUE, TRUE );
 // If there're more records then assign next_offset
 $cant_pages = ceil($listpages["cant"] / $maxRecords);
-$smarty->assign_by_ref('cant_pages', $cant_pages);
-$smarty->assign_by_ref('pagecount', $listpages['cant']);
-$smarty->assign('actual_page', 1 + ($offset / $maxRecords));
+$gBitSmarty->assign_by_ref('cant_pages', $cant_pages);
+$gBitSmarty->assign_by_ref('pagecount', $listpages['cant']);
+$gBitSmarty->assign('actual_page', 1 + ($offset / $maxRecords));
 if ($listpages["cant"] > ($offset + $maxRecords)) {
-	$smarty->assign('next_offset', $offset + $maxRecords);
+	$gBitSmarty->assign('next_offset', $offset + $maxRecords);
 } else {
-	$smarty->assign('next_offset', -1);
+	$gBitSmarty->assign('next_offset', -1);
 }
 // If offset is > 0 then prev_offset
 if ($offset > 0) {
-	$smarty->assign('prev_offset', $offset - $maxRecords);
+	$gBitSmarty->assign('prev_offset', $offset - $maxRecords);
 } else {
-	$smarty->assign('prev_offset', -1);
+	$gBitSmarty->assign('prev_offset', -1);
 }
-$smarty->assign_by_ref('listpages', $listpages["data"]);
+$gBitSmarty->assign_by_ref('listpages', $listpages["data"]);
 //print_r($listpages["data"]);
 
 // Display the template