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

1 files changed, 7 insertions, 3 deletions

diff --git a/orphan_pages.php b/orphan_pages.php
index 8808ab6..b8ff3bf 100644
--- a/orphan_pages.php
+++ b/orphan_pages.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_wiki/orphan_pages.php,v 1.2 2005/06/28 07:46:27 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_wiki/orphan_pages.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: orphan_pages.php,v 1.2 2005/06/28 07:46:27 spiderr Exp $
+ * $Id: orphan_pages.php,v 1.3 2005/07/17 17:36:45 squareing Exp $
  * @package wiki
  * @subpackage functions
  */
@@ -73,6 +73,7 @@ if ( empty( $_REQUEST["sort_mode"] ) ) {
 } else {
 	$sort_mode = $_REQUEST["sort_mode"];
 }
+$smarty->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
@@ -93,10 +94,13 @@ if (isset($_REQUEST["find"])) {
 }
 $smarty->assign('find', $find);
 // Get a list of last changes to the Wiki database
-$listpages = $BitPage->getList( $offset, $maxRecords, $sort_mode, $find, NULL, NULL, TRUE );
+$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));
 if ($listpages["cant"] > ($offset + $maxRecords)) {
 	$smarty->assign('next_offset', $offset + $maxRecords);