move parseData to BitPage::load and do some spring cleaning

1 files changed, 2 insertions, 18 deletions

diff --git a/print.php b/print.php
index d929034..5e055b9 100644
--- a/print.php
+++ b/print.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_wiki/print.php,v 1.10 2006/02/06 22:56:52 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_wiki/print.php,v 1.11 2006/02/19 15:36:09 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: print.php,v 1.10 2006/02/06 22:56:52 squareing Exp $
+ * $Id: print.php,v 1.11 2006/02/19 15:36:09 squareing Exp $
  * @package wiki
  * @subpackage functions
  */
@@ -62,22 +62,6 @@ if ($info["flag"] == 'L') {
 } else {
 	$gBitSmarty->assign('lock', false);
 }
-$gBitSmarty->assign('cached_page','n');
-if(isset($gContent->mInfo['wiki_cache']) && $gContent->mInfo['wiki_cache']>0) {$wiki_cache=$gContent->mInfo['wiki_cache'];}
-if($wiki_cache>0) {
-	$cache_info = $wikilib->get_cache_info($page);
-	$now = $gBitSystem->getUTCTime();
-	if($cache_info['cache_timestamp']+$wiki_cache > $now) {
-		$pdata = $cache_info['cache'];
-		$gBitSmarty->assign('cached_page','y');
-	} else {
-		$pdata = $gContent->parseData();
-		$wikilib->update_cache($page,$pdata);
-	}
-} else {
-	$pdata = $gContent->parseData();
-}
-$gBitSmarty->assign_by_ref('parsed', $pdata);
 $gBitSmarty->assign_by_ref('last_modified', $info["last_modified"]);
 if (empty($info["user"])) {
 	$info["user"] = 'anonymous';