Equalize the usage of parsing markdown and textile

Author: slackero

include/inc_front/content/cnt0.article.inc.php

@@ -50,8 +50,7 @@
         break;
 
     case 'textile':
-        init_textile();
-        $crow['acontent_text'] = $phpwcms['textile_class']->parse($crow['acontent_text']);
+        $crow['acontent_text'] = parse_textile($crow['acontent_text']);
         break;
 
     case 'plain':

include/inc_front/content/cnt14.article.inc.php

@@ -95,7 +95,6 @@
 			} elseif(isset($crow['fieldgroup'][$custom_field_key]['render']) && in_array($crow['fieldgroup'][$custom_field_key]['render'], $crow['field_render'])) {
 
 				if($crow['fieldgroup'][$custom_field_key]['render'] === 'markdown') {
-					init_markdown();
 					$crow["acontent_template"] = render_cnt_template($crow["acontent_template"], $custom_field_replacer, parse_markdown($custom_field_value));
 				} elseif($crow['fieldgroup'][$custom_field_key]['render'] === 'plain') {
 					$crow["acontent_template"] = render_cnt_template($crow["acontent_template"], $custom_field_replacer, plaintext_htmlencode($custom_field_value));

include/inc_front/content/cnt31.article.inc.php

@@ -60,12 +60,6 @@
 
     if(is_array($image['tmpl_settings']) && count($image['tmpl_settings'])) {
         $image = array_merge($image, $image['tmpl_settings']);
-
-        if($image['text_render'] === 'markdown') {
-            init_markdown();
-        } elseif($image['text_render'] === 'textile') {
-            init_textile();
-        }
     }
 
     $image['tmpl_header']           = get_tmpl_section('IMAGES_HEADER', $image['template']);
@@ -367,7 +361,7 @@
                     break;
 
                 case 'textile':
-                    $value['freetext'] = $phpwcms['textile_class']->parse($value['freetext']);
+                    $value['freetext'] = parse_textile($value['freetext']);
                     break;
 
                 case 'html':
@@ -479,7 +473,6 @@
                     } elseif(isset($image['fieldgroup'][$custom_field_key]['render']) && in_array($image['fieldgroup'][$custom_field_key]['render'], $image['field_render'])) {
 
                         if($image['fieldgroup'][$custom_field_key]['render'] === 'markdown') {
-                            init_markdown();
                             $img_a = render_cnt_template($img_a, $custom_field_replacer, parse_markdown($custom_field_value));
                         } elseif($image['fieldgroup'][$custom_field_key]['render'] === 'plain') {
                             $img_a = render_cnt_template($img_a, $custom_field_replacer, plaintext_htmlencode($custom_field_value));

include/inc_front/content/cnt32.article.inc.php

@@ -150,7 +150,6 @@
                 } elseif(isset($tabs['fieldgroup'][$custom_field_key]['render']) && in_array($tabs['fieldgroup'][$custom_field_key]['render'], $tabs['field_render'])) {
 
                     if($tabs['fieldgroup'][$custom_field_key]['render'] === 'markdown') {
-                        init_markdown();
                         $tabs['entries'][$key] = render_cnt_template($tabs['entries'][$key], $custom_field_replacer, parse_markdown($custom_field_value));
                     } elseif($tabs['fieldgroup'][$custom_field_key]['render'] === 'plain') {
                         $tabs['entries'][$key] = render_cnt_template($tabs['entries'][$key], $custom_field_replacer, plaintext_htmlencode($custom_field_value));

include/inc_front/content/cnt33.article.inc.php

@@ -445,13 +445,11 @@
                     $value['cnt_teasertext'] = br_htmlencode($value['cnt_teasertext']);
                     $value['cnt_description'] = br_htmlencode($value['cnt_description']);
                 } elseif($value['cnt_object']['cnt_textformat'] === 'markdown') {
-                    init_markdown();
                     $value['cnt_teasertext'] = parse_markdown($value['cnt_teasertext']);
                     $value['cnt_description'] = parse_markdown($value['cnt_description']);
                 } elseif($value['cnt_object']['cnt_textformat'] === 'textile') {
-                    init_textile();
-                    $value['cnt_teasertext'] = $phpwcms['textile_class']->parse($value['cnt_teasertext']);
-                    $value['cnt_description'] = $phpwcms['textile_class']->parse($value['cnt_description']);
+                    $value['cnt_teasertext'] = parse_textile($value['cnt_teasertext']);
+                    $value['cnt_description'] = parse_textile($value['cnt_description']);
                 } else {
                     $value['cnt_teasertext'] = html($value['cnt_teasertext']);
                     $value['cnt_description'] = html($value['cnt_description']);