diff options
| -rwxr-xr-x | LibertySystem.php | 6 | ||||
| -rw-r--r-- | plugins/format.tikiwiki.php | 8 |
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(); |