diff options
| -rw-r--r-- | BitNewsletterEdition.php | 1 | ||||
| -rw-r--r-- | edition_edit.php | 4 | ||||
| -rw-r--r-- | templates/center_list_newsletters.tpl | 2 | ||||
| -rw-r--r-- | templates/view_edition.tpl | 2 | ||||
| -rw-r--r-- | templates/view_newsletter.tpl | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/BitNewsletterEdition.php b/BitNewsletterEdition.php index b3629ba..9309c0b 100644 --- a/BitNewsletterEdition.php +++ b/BitNewsletterEdition.php @@ -170,7 +170,6 @@ class BitNewsletterEdition extends LibertyMime { $ret[$k]['display_url'] = BitNewsletterEdition::getDisplayUrlFromHash( $ret[$k] ); // remove formating tags $data = preg_replace( '/{[^{}]*}/', '', $ret[$k]['data'] ); -// $ret[$k]['parsed'] = BitNewsletterEdition::parseData( $data, $ret[$k]['format_guid'] ); } $pListHash['total_records'] = $gBitDb->getOne( $query_cant, $bindVars ); $pListHash['block_pages'] = 5; diff --git a/edition_edit.php b/edition_edit.php index 4a43c9b..f1edfaf 100644 --- a/edition_edit.php +++ b/edition_edit.php @@ -42,6 +42,7 @@ if( !empty( $gContent->mInfo ) ) { if( isset( $_REQUEST["edit"] ) ) { $formInfo['data'] = $_REQUEST["edit"]; + $formInfo['format_guid'] = ( !empty( $_REQUEST['format_guid'] ) ? $_REQUEST['format_guid'] : ( isset( $gContent->mInfo['format_guid'] ) ? $gContent->mInfo['format_guid'] : 'tikiwiki' ) ); } if( isset( $_REQUEST['title'] ) ) { $formInfo['title'] = $_REQUEST['title']; @@ -60,8 +61,7 @@ if (isset($_REQUEST["preview"])) { $gBitSmarty->assign( 'title',!empty( $_REQUEST["title"] ) ? $_REQUEST["title"] : $gContent->getTitle() ); - $parsed = $gContent->parseData( $formInfo['data'],( !empty( $_REQUEST['format_guid'] ) ? $_REQUEST['format_guid'] : - ( isset( $gContent->mInfo['format_guid'] ) ? $gContent->mInfo['format_guid'] : 'tikiwiki' ) ) ); + $parsed = LibertyContent::parseDataHash( $formInfo['data'] ); $gBitSmarty->assignByRef( 'parsed', $parsed ); $gContent->invokeServices( 'content_preview_function' ); diff --git a/templates/center_list_newsletters.tpl b/templates/center_list_newsletters.tpl index 29d9ba5..e22e685 100644 --- a/templates/center_list_newsletters.tpl +++ b/templates/center_list_newsletters.tpl @@ -21,7 +21,7 @@ <div class="form-group"> {formlabel label="Description" for=""} {forminput} - {$gContent->parseData()} + {$gContent->getParsedData()} {/forminput} </div> {if ($gContent->getField('allow_user_sub') eq 'y') or $gBitUser->hasPermission( 'p_newsletters_subscribe' )} diff --git a/templates/view_edition.tpl b/templates/view_edition.tpl index 7965f95..ba5d4e0 100644 --- a/templates/view_edition.tpl +++ b/templates/view_edition.tpl @@ -26,7 +26,7 @@ <div class="body"> <div class="content"> - {$gContent->parseData()} + {$gContent->getParsedData()} </div> <!-- end .content --> </div> <!-- end .body --> diff --git a/templates/view_newsletter.tpl b/templates/view_newsletter.tpl index bd95298..140d786 100644 --- a/templates/view_newsletter.tpl +++ b/templates/view_newsletter.tpl @@ -24,7 +24,7 @@ <div class="body"> <div class="content"> - {$gContent->parseData()} + {$gContent->getParsedData()} {include file="bitpackage:newsletters/list_editions_inc.tpl" editionList=$gContent->getEditions()} </div> <!-- end .content --> |