summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BitPage.php8
-rw-r--r--page_history.php10
-rw-r--r--print_multi_pages.php6
-rw-r--r--received_pages.php8
-rw-r--r--rollback.php6
-rw-r--r--wiki_rss.php4
6 files changed, 21 insertions, 21 deletions
diff --git a/BitPage.php b/BitPage.php
index b7eab76..be58d1d 100644
--- a/BitPage.php
+++ b/BitPage.php
@@ -1,11 +1,11 @@
<?php
/**
- * @version $Header: /cvsroot/bitweaver/_bit_wiki/BitPage.php,v 1.40 2006/02/14 21:53:26 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_wiki/BitPage.php,v 1.41 2006/02/16 13:48:13 squareing Exp $
* @package wiki
*
* @author spider <spider@steelsun.com>
*
- * @version $Revision: 1.40 $ $Date: 2006/02/14 21:53:26 $ $Author: squareing $
+ * @version $Revision: 1.41 $ $Date: 2006/02/16 13:48:13 $ $Author: squareing $
*
* Copyright (c) 2004 bitweaver.org
* Copyright (c) 2003 tikwiki.org
@@ -13,7 +13,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: BitPage.php,v 1.40 2006/02/14 21:53:26 squareing Exp $
+ * $Id: BitPage.php,v 1.41 2006/02/16 13:48:13 squareing Exp $
*/
/**
@@ -1077,7 +1077,7 @@ class WikiLib extends BitPage {
while ($res = $result->fetchRow()) {
$title = $res["title"] . '.html';
- $dat = $this->parseData($res["data"]);
+ $dat = $this->parseData($res);
// Now change index.php?page=foo to foo.html
// and index.php to HomePage.html
$dat = preg_replace("/index.php\?page=([^\'\"\$]+)/", "$1.html", $dat);
diff --git a/page_history.php b/page_history.php
index 43faf1f..307a11a 100644
--- a/page_history.php
+++ b/page_history.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_wiki/page_history.php,v 1.8 2006/02/07 01:19:19 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_wiki/page_history.php,v 1.9 2006/02/16 13:48: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.8 2006/02/07 01:19:19 spiderr Exp $
+ * $Id: page_history.php,v 1.9 2006/02/16 13:48:13 squareing Exp $
* @package wiki
* @subpackage functions
*/
@@ -51,7 +51,7 @@ if (isset($_REQUEST["delete"]) && isset($_REQUEST["hist"])) {
}
} elseif (isset($_REQUEST["preview"])) {
if( $version = $gContent->getHistory( $_REQUEST["preview"] ) ) {
- $gBitSmarty->assign_by_ref('parsed', $gContent->parseData( $version[0]["data"], $version[0]["format_guid"] ) );
+ $gBitSmarty->assign_by_ref('parsed', $gContent->parseData( $version[0] ) );
$gBitSmarty->assign_by_ref('version', $_REQUEST["preview"]);
}
} elseif( isset( $_REQUEST["diff2"] ) ) {
@@ -74,12 +74,12 @@ if (isset($_REQUEST["delete"]) && isset($_REQUEST["hist"])) {
$from_version = $_REQUEST["compare"];
$from_page = $gContent->getHistory($from_version);
$gBitSmarty->assign('compare', 'y');
- $gBitSmarty->assign_by_ref('diff_from', $gContent->parseData( $from_page[0]["data"], $from_page[0]["format_guid"] ) );
+ $gBitSmarty->assign_by_ref('diff_from', $gContent->parseData( $from_page[0] ) );
$gBitSmarty->assign_by_ref('diff_to', $gContent->parseData() );
$gBitSmarty->assign_by_ref('version_from', $from_version);
} elseif (isset($_REQUEST["rollback"])) {
if( $version = $gContent->getHistory( $_REQUEST["preview"] ) ) {
- $gBitSmarty->assign_by_ref('parsed', $gContent->parseData( $version[0]["data"], $version[0]["format_guid"] ) );
+ $gBitSmarty->assign_by_ref('parsed', $gContent->parseData( $version[0] ) );
$gBitSmarty->assign_by_ref('version', $_REQUEST["preview"]);
}
}
diff --git a/print_multi_pages.php b/print_multi_pages.php
index 31cce4f..3111870 100644
--- a/print_multi_pages.php
+++ b/print_multi_pages.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_wiki/print_multi_pages.php,v 1.5 2006/02/06 22:56:52 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_wiki/print_multi_pages.php,v 1.6 2006/02/16 13:48: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: print_multi_pages.php,v 1.5 2006/02/06 22:56:52 squareing Exp $
+ * $Id: print_multi_pages.php,v 1.6 2006/02/16 13:48:13 squareing Exp $
* @package wiki
* @subpackage functions
*/
@@ -36,7 +36,7 @@ if (isset($_REQUEST["print"])) {
$page = new BitPage( NULL, $contentId );
if( $page->load() && $page->hasUserPermission( 'bit_p_view', TRUE )) {
$page_info = $page->mInfo;
- $page_info["parsed"] = $page->parseData( $page_info["data"] );
+ $page_info["parsed"] = $page->parseData( $page_info );
$pages[] = $page_info;
}
}
diff --git a/received_pages.php b/received_pages.php
index fa85479..1f800b0 100644
--- a/received_pages.php
+++ b/received_pages.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_wiki/Attic/received_pages.php,v 1.6 2006/02/06 00:12:23 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_wiki/Attic/received_pages.php,v 1.7 2006/02/16 13:48: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: received_pages.php,v 1.6 2006/02/06 00:12:23 squareing Exp $
+ * $Id: received_pages.php,v 1.7 2006/02/16 13:48:13 squareing Exp $
* @package wiki
* @subpackage functions
*/
@@ -57,7 +57,7 @@ $gBitSmarty->assign('title', $info["title"]);
$gBitSmarty->assign('data', $info["data"]);
$gBitSmarty->assign('comment', $info["comment"]);
// Assign parsed
-$gBitSmarty->assign('parsed', $wikilib->parseData($info["data"]));
+$gBitSmarty->assign('parsed', $wikilib->parseData($info));
if (isset($_REQUEST["remove"])) {
$commlib->remove_received_page($_REQUEST["remove"]);
@@ -69,7 +69,7 @@ if (isset($_REQUEST["save"])) {
$gBitSmarty->assign('data', $_REQUEST["data"]);
$gBitSmarty->assign('comment', $_REQUEST["comment"]);
$gBitSmarty->assign('received_page_id', $_REQUEST["received_page_id"]);
- $gBitSmarty->assign('parsed', $gBitSystem->parseData($_REQUEST["data"]));
+ $gBitSmarty->assign('parsed', $gBitSystem->parseData($_REQUEST));
}
if (empty( $_REQUEST["sort_mode"] )) {
$sort_mode = 'received_date_desc';
diff --git a/rollback.php b/rollback.php
index b2af872..2c2719b 100644
--- a/rollback.php
+++ b/rollback.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_wiki/Attic/rollback.php,v 1.5 2006/02/04 19:04:35 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_wiki/Attic/rollback.php,v 1.6 2006/02/16 13:48: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: rollback.php,v 1.5 2006/02/04 19:04:35 squareing Exp $
+ * $Id: rollback.php,v 1.6 2006/02/16 13:48:13 squareing Exp $
* @package wiki
* @subpackage functions
*/
@@ -48,7 +48,7 @@ if (!$gBitUser->hasPermission( 'bit_p_rollback' )) {
die;
}
$version = $gContent->getHistory( $version );
-$version[0]["data"] = $gContent->parseData($version[0]["data"]);
+$version[0]["data"] = $gContent->parseData($version[0]);
$gBitSmarty->assign_by_ref('preview', $version[0]);
if (isset($_REQUEST["rollback"])) {
if( $gContent->rollbackVersion( $_REQUEST["version"] ) ) {
diff --git a/wiki_rss.php b/wiki_rss.php
index e468c79..0f9c518 100644
--- a/wiki_rss.php
+++ b/wiki_rss.php
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Header: /cvsroot/bitweaver/_bit_wiki/wiki_rss.php,v 1.8 2006/02/09 10:30:38 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_wiki/wiki_rss.php,v 1.9 2006/02/16 13:48:13 squareing Exp $
* @package wiki
* @subpackage functions
*/
@@ -38,7 +38,7 @@ if( !$gBitUser->hasPermission( 'bit_p_view' ) ) {
$item = new FeedItem();
$item->title = $feed['title'];
$item->link = BIT_BASE_URI.$wiki->getDisplayUrl( $feed['title'] );
- $item->description = $wiki->parseData( $feed['data'], $feed['format_guid'] );
+ $item->description = $wiki->parseData( $feed );
$item->date = ( int )$feed['last_modified'];
$item->source = 'http://'.$_SERVER['HTTP_HOST'].BIT_ROOT_URL;
generated by cgit v1.3 (git 2.53.0) at 2026-07-01 06:01:29 +0000