diff options
| -rw-r--r-- | content_history_inc.php | 2 | ||||
| -rw-r--r-- | plugins/data.attachment.php | 4 | ||||
| -rw-r--r-- | plugins/data.include.php | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/content_history_inc.php b/content_history_inc.php index e2cfd19..d5cb3a6 100644 --- a/content_history_inc.php +++ b/content_history_inc.php @@ -70,7 +70,7 @@ if( isset( $_REQUEST["delete"] ) && isset( $_REQUEST["hist"] )) { $from_page = $gContent->getHistory( $from_version ); $from_page['data'][0]['no_cache'] = TRUE; $gBitSmarty->assign( 'compare', 'y' ); - $gBitSmarty->assign( 'diff_from', LibertyContent::parseDataHash( $from_page['data'][0] ) ); + $gBitSmarty->assign( 'diff_from', LibertyContent::parseDataHash( $from_page['data'][0], $gContent ) ); $gBitSmarty->assign( 'diff_to', $gContent->getParsedData() ); $gBitSmarty->assignByRef( 'version_from', $from_version ); diff --git a/plugins/data.attachment.php b/plugins/data.attachment.php index f4537ac..4e293a0 100644 --- a/plugins/data.attachment.php +++ b/plugins/data.attachment.php @@ -169,8 +169,8 @@ function data_attachment( $pData, $pParams, $pCommonObject, $pParseHash ) { } $wrapper['display_url'] = $pParams['link']; } elseif( !empty( $att['display_url'] ) ) { - $wrapper['display_url'] = $att['display_url']; - } + $wrapper['display_url'] = $att['display_url']; + } if( !empty( $wrapper['description'] )) { $parseHash['content_id'] = $pParseHash['content_id']; diff --git a/plugins/data.include.php b/plugins/data.include.php index 4fa677d..e985cc0 100644 --- a/plugins/data.include.php +++ b/plugins/data.include.php @@ -75,7 +75,8 @@ function data_include($data, $params) { $ret = "<p>Please enter a valid 'page_name', 'page_id' or 'content_id' to include in this page.</p>"; // load page by page_id if( isset( $params['page_id'] ) && is_numeric( $params['page_id'] ) ) { - require_once( WIKI_PKG_PATH.'BitPage.php'); + global $gLibertySystem; + $typeClass = $gLibertySystem->getContentClassName( 'bitpage' ); $wp = new BitPage( $params['page_id'] ); if( $wp->load() ) { $ret = $wp->getParsedData(); |