Skip to content

Commit 750974c

Browse files
committed
Switch to parse() to fix Textile warnings
1 parent e4a614a commit 750974c

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

smd_tags.php

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2007,8 +2007,7 @@ function smd_tags_toggle_report() {
20072007
function smd_tag_save() {
20082008
// Defer doSlash of description until after Textile's had a go
20092009
extract(doSlash(gpsa(array('smd_tag_oname', 'smd_tag_name', 'smd_tag_title', 'smd_tag_parent', 'smd_tag_cat', 'smd_tag_type', 'smd_tag_id'))));
2010-
@include_once txpath.'/publish.php'; // for parse()
2011-
@include_once txpath.'/lib/classTextile.php';
2010+
include_once txpath.'/publish.php'; // for parse()
20122011

20132012
$smd_tag_description = $smd_tags_desctile = ps('smd_tag_description');
20142013

@@ -2022,17 +2021,14 @@ function smd_tag_save() {
20222021
$smd_tag_parent = (!empty($smd_tag_parent)) ? $smd_tag_parent : 'root';
20232022
$smd_tag_name = trim($smd_tag_name);
20242023

2025-
if (class_exists('Textile')) {
2026-
$textile = new Textile();
2027-
$smd_tags_desctile = doSlash((($txt_desc) ? $textile->TextileThis(parse($smd_tag_description)) : parse($smd_tag_description)));
2028-
}
2029-
2024+
$textile = new \Textpattern\Textile\Parser();
2025+
$smd_tags_desctile = doSlash((($txt_desc) ? $textile->parse(parse($smd_tag_description)) : parse($smd_tag_description)));
20302026
$smd_tag_description = doSlash($smd_tag_description);
20312027

20322028
// Can't use safe_upsert() because the WHERE is for ID AND type
20332029
if (empty($smd_tag_id)) {
20342030
// Create
2035-
if ($smd_tag_name=='' && $smd_tag_title=='') {
2031+
if ($smd_tag_name == '' && $smd_tag_title == '') {
20362032
$message = array(gTxt('smd_tag_no_name', array('{type}' => ucfirst($smd_tag_type))), E_WARNING);
20372033
} else {
20382034
$alltagnam = do_list($smd_tag_name, $mdelim);

0 commit comments

Comments
 (0)