MDL-22537 new html purifier backported to stable, unfortunately PHP5 only

lib/htmlpurifier/HTMLPurifier/Definition.php

@@ -4,37 +4,36 @@
  * Super-class for definition datatype objects, implements serialization
  * functions for the class.
  */
-class HTMLPurifier_Definition
+abstract class HTMLPurifier_Definition
 {
-    
+
     /**
      * Has setup() been called yet?
      */
-    var $setup = false;
-    
+    public $setup = false;
+
     /**
      * What type of definition is it?
      */
-    var $type;
-    
+    public $type;
+
     /**
      * Sets up the definition object into the final form, something
      * not done by the constructor
      * @param $config HTMLPurifier_Config instance
      */
-    function doSetup($config) {
-        trigger_error('Cannot call abstract method', E_USER_ERROR);
-    }
-    
+    abstract protected function doSetup($config);
+
     /**
      * Setup function that aborts if already setup
      * @param $config HTMLPurifier_Config instance
      */
-    function setup($config) {
+    public function setup($config) {
         if ($this->setup) return;
         $this->setup = true;
         $this->doSetup($config);
     }
-    
+
 }
 
+// vim: et sw=4 sts=4