diff options
| -rw-r--r-- | LibertyContent.php | 4 | ||||
| -rw-r--r-- | LibertyMime.php | 2 | ||||
| -rw-r--r-- | LibertyStructure.php | 4 | ||||
| -rw-r--r-- | liberty_lib.php | 2 | ||||
| -rw-r--r-- | modules/mod_structure_toc.php | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/LibertyContent.php b/LibertyContent.php index 916f7de..11f6c9d 100644 --- a/LibertyContent.php +++ b/LibertyContent.php @@ -3041,7 +3041,7 @@ class LibertyContent extends LibertyBase implements BitCacheable { LibertyContent::filterData( $parseHash['data'], $parseHash, 'preplugin' ); // this will handle all liberty data plugins like {code} and {attachment} usage in all formats - parse_data_plugins( $parseHash['data'], $replace, $this, $parseHash ); + parse_data_plugins( $parseHash['data'], $replace, (!empty( $this ) ? $this : NULL), $parseHash ); // pre parse filter according to what we're parsing - split or full body $filter = empty( $parseHash['split_parse'] ) ? 'parse' : 'split'; @@ -3049,7 +3049,7 @@ class LibertyContent extends LibertyBase implements BitCacheable { if( $func = $gLibertySystem->getPluginFunction( $parseHash['format_guid'], 'load_function' ) ) { // get the beast parsed - if( $ret = $func( $parseHash, $this )) { + if( !empty( $this ) && ($ret = $func( $parseHash, $this )) ) { // post parse filter LibertyContent::filterData( $ret, $parseHash, 'post'.$filter ); diff --git a/LibertyMime.php b/LibertyMime.php index f295882..4040e13 100644 --- a/LibertyMime.php +++ b/LibertyMime.php @@ -9,7 +9,7 @@ * required setup */ require_once( LIBERTY_PKG_PATH.'LibertyContent.php' ); - +$gBitSystem->setConfig( 'image_processor','imagick' ); // load the image processor plugin, check for loaded 'gd' since that is the default processor, and config might not be set. if( $gBitSystem->isFeatureActive( 'image_processor' ) || extension_loaded( 'gd' ) ) { require_once( LIBERTY_PKG_PATH."plugins/processor.".$gBitSystem->getConfig( 'image_processor','gd' ).".php" ); diff --git a/LibertyStructure.php b/LibertyStructure.php index e8a9ce3..fdb2c64 100644 --- a/LibertyStructure.php +++ b/LibertyStructure.php @@ -995,8 +995,8 @@ class LibertyStructure extends LibertyBase { if( !@$this->verifyId( $pStructureId ) ) { $pStructureId = $this->mStructureId; } - $structureTree = $this->buildSubtreeToc( $pStructureId, $order, $numberPrefix, $pNumberDepth, $pCss ); - return '<div class="aciTree" id="structure-'.$this->mStructureId.'">'.$this->fetchToc( $structureTree,$showdesc,$pNumberDepth ).'</div>'; + $structureTree = $this->buildSubtreeToc( $pStructureId, $order, $numberPrefix, $pNumberDepth ); + return '<div class="aciTree" id="structure-'.$this->mStructureId.'">'.$this->fetchToc( $structureTree, $showdesc, $pNumberDepth, $pCss ).'</div>'; } /** diff --git a/liberty_lib.php b/liberty_lib.php index 8d77566..f9bd632 100644 --- a/liberty_lib.php +++ b/liberty_lib.php @@ -13,7 +13,7 @@ * @access public * @return void */ -function parse_data_plugins( &$pData, &$pReplace, &$pCommonObject, $pParseHash ) { +function parse_data_plugins( &$pData, &$pReplace, $pCommonObject, $pParseHash ) { global $gLibertySystem, $gBitSystem; // note: $curlyTags[0] is the complete match, $curlyTags[1] is plugin name, $curlyTags[2] is plugin arguments diff --git a/modules/mod_structure_toc.php b/modules/mod_structure_toc.php index b79dd04..164f9b9 100644 --- a/modules/mod_structure_toc.php +++ b/modules/mod_structure_toc.php @@ -39,7 +39,7 @@ if( is_object( $gStructure ) && $gStructure->isValid() && $gStructure->hasViewPe } } -if( is_object( $struct ) && count( $struct->isValid() ) ) { +if( is_object( $struct ) && $struct->isValid() ) { if( !empty( $moduleParams['title'] ) ) { $_template->tpl_vars['moduleTitle'] = new Smarty_variable( $moduleParams['title'] ); } |