Changeset 6670 for trunk/src/includes/admin/converters/vBulletin3.php

Timestamp:

08/27/2017 11:24:00 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Converter: more OOP, specifically for the BBCode parser.

This change introduces a bbcode_parser_properties array to the base converter, allowing custom BBCode parser properties to be passed into the parent method via the child, minimizing the amount of code in each individual forum converter.

Trunk, for 2.6.

File:

• trunk/src/includes/admin/converters/vBulletin3.php (modified) (6 diffs)

trunk/src/includes/admin/converters/vBulletin3.php

@@ -21 +21 @@
      *
      */
-    function __construct() {
+    public function __construct() {
         parent::__construct();
-        $this->setup_globals();
     }
 
@@ -30 +29 @@
      */
     private function setup_globals() {
+
+        // Setup smiley URL & path
+        $this->bbcode_parser_properties = array(
+            'smiley_url' => false,
+            'smiley_dir' => false
+        );
 
         /** Forum Section *****************************************************/
@@ -655 +660 @@
 
     /**
-     * Translate the forum type from vBulletin v3.x numeric's to WordPress's strings.
+     * Translate the forum type from vBulletin v3.x numerics to WordPress's strings.
      *
      * @param int $status vBulletin v3.x numeric forum type
@@ -670 +675 @@
 
     /**
-     * Translate the topic sticky status type from vBulletin v3.x numeric's to WordPress's strings.
+     * Translate the topic sticky status type from vBulletin v3.x numerics to WordPress's strings.
      *
      * @param int $status vBulletin v3.x numeric forum type
@@ -701 +706 @@
 
     /**
-     * Translate the post status from vBulletin v3.x numeric's to WordPress's strings.
+     * Translate the post status from vBulletin v3.x numerics to WordPress's strings.
      *
      * @param int $status vBulletin v3.x numeric topic status
@@ -745 +750 @@
 
         // Parse out any bbCodes in $field with the BBCode 'parser.php'
-        require_once bbpress()->admin->admin_dir . 'parser.php';
-        $bbcode = BBCode::getInstance();
-        $bbcode->enable_smileys = false;
-        $bbcode->smiley_regex   = false;
-        return html_entity_decode( $bbcode->Parse( $field ) );
+        return parent::callback_html( $field );
     }
 }