summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJams H Thompson <jht001@users.sourceforge.net>2006-08-26 21:12:01 +0000
committerJams H Thompson <jht001@users.sourceforge.net>2006-08-26 21:12:01 +0000
commit48779ea62e3926ad27cf03f94a47e23fad832972 (patch)
treeabcadda30324e4566b276de8b4a34ef73719205f
parent68dd10a2bdd44738e39dc2f99375d7f51ffc1fe8 (diff)
downloadliberty-48779ea62e3926ad27cf03f94a47e23fad832972.tar.gz
liberty-48779ea62e3926ad27cf03f94a47e23fad832972.tar.bz2
liberty-48779ea62e3926ad27cf03f94a47e23fad832972.zip
Make more information available to plugins
-rwxr-xr-xLibertySystem.php6
-rw-r--r--plugins/format.tikiwiki.php8
2 files changed, 7 insertions, 7 deletions
diff --git a/LibertySystem.php b/LibertySystem.php
index 9d2a316..fb7bcf0 100755
--- a/LibertySystem.php
+++ b/LibertySystem.php
@@ -3,7 +3,7 @@
* System class for handling the liberty package
*
* @package liberty
-* @version $Header: /cvsroot/bitweaver/_bit_liberty/LibertySystem.php,v 1.39 2006/08/20 22:39:22 hash9 Exp $
+* @version $Header: /cvsroot/bitweaver/_bit_liberty/LibertySystem.php,v 1.40 2006/08/26 21:12:00 jht001 Exp $
* @author spider <spider@steelsun.com>
*/
@@ -454,7 +454,7 @@ class LibertySystem extends LibertyBase {
* @access public
* @return TRUE on success, FALSE on failure - mErrors will contain reason for failure
*/
-function parse_data_plugins( &$data, &$preparsed, &$noparsed, &$pParser ) {
+function parse_data_plugins( &$data, &$preparsed, &$noparsed, &$pParser, &$pCommonObject ) {
global $gLibertySystem;
// Find the plugins
// note: $curlyTags[0] is the complete match, $curlyTags[1] is plugin name, $curlyTags[2] is plugin arguments
@@ -551,7 +551,7 @@ function parse_data_plugins( &$data, &$preparsed, &$noparsed, &$pParser ) {
$arguments = parse_xml_attributes( $paramString );
}
- if( $ret = $loadFunc( $plugin_data, $arguments ) ) {
+ if( $ret = $loadFunc( $plugin_data, $arguments, $pCommonObject ) ) {
// temporarily replace end of lines so tables and other things render properly
// $ret = preg_replace( "/\n/", '#EOL', $ret );
diff --git a/plugins/format.tikiwiki.php b/plugins/format.tikiwiki.php
index 299dd9c..8744933 100644
--- a/plugins/format.tikiwiki.php
+++ b/plugins/format.tikiwiki.php
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Revision: 1.59 $
+ * @version $Revision: 1.60 $
* @package liberty
*/
global $gLibertySystem;
@@ -365,11 +365,11 @@ class TikiWikiParser extends BitBase {
// This recursive function handles pre- and no-parse sections and plugins
- function parse_first(&$data, &$preparsed, &$noparsed) {
+ function parse_first(&$data, &$preparsed, &$noparsed, &$pCommonObject) {
global $gLibertySystem;
$this->parse_pp_np($data, $preparsed, $noparsed);
// Handle pre- and no-parse sections
- parse_data_plugins( $data, $preparsed, $noparsed, $this );
+ parse_data_plugins( $data, $preparsed, $noparsed, $this, $pCommonObject );
}
@@ -770,7 +770,7 @@ class TikiWikiParser extends BitBase {
// Handle pre- and no-parse sections and plugins
$preparsed = array();
$noparsed = array();
- $this->parse_first($data, $preparsed, $noparsed);
+ $this->parse_first($data, $preparsed, $noparsed, $pCommonObject);
// Extract [link] sections (to be re-inserted later)
$noparsedlinks = array();