From fc06f221d5128da43dec5113e621de035fd4eb9b Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Wed, 11 Apr 2007 21:44:26 +0000 Subject: [PATCH] Remove redundant $info member variable. git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@960 48356398-32a2-884e-a903-53898d9a118a --- library/HTMLPurifier/HTMLModule/Bdo.php | 1 - library/HTMLPurifier/HTMLModule/Edit.php | 1 - library/HTMLPurifier/HTMLModule/Hypertext.php | 1 - library/HTMLPurifier/HTMLModule/Image.php | 1 - library/HTMLPurifier/HTMLModule/List.php | 2 +- library/HTMLPurifier/HTMLModule/Presentation.php | 1 - library/HTMLPurifier/HTMLModule/Tables.php | 1 - library/HTMLPurifier/HTMLModule/Text.php | 2 -- 8 files changed, 1 insertion(+), 9 deletions(-) diff --git a/library/HTMLPurifier/HTMLModule/Bdo.php b/library/HTMLPurifier/HTMLModule/Bdo.php index 17e5e987..6feae005 100644 --- a/library/HTMLPurifier/HTMLModule/Bdo.php +++ b/library/HTMLPurifier/HTMLModule/Bdo.php @@ -12,7 +12,6 @@ class HTMLPurifier_HTMLModule_Bdo extends HTMLPurifier_HTMLModule var $name = 'Bdo'; var $elements = array('bdo'); - var $info = array(); var $content_sets = array('Inline' => 'bdo'); var $attr_collections = array( 'I18N' => array('dir' => false) diff --git a/library/HTMLPurifier/HTMLModule/Edit.php b/library/HTMLPurifier/HTMLModule/Edit.php index 6a415906..c3dc0197 100644 --- a/library/HTMLPurifier/HTMLModule/Edit.php +++ b/library/HTMLPurifier/HTMLModule/Edit.php @@ -12,7 +12,6 @@ class HTMLPurifier_HTMLModule_Edit extends HTMLPurifier_HTMLModule var $name = 'Edit'; var $elements = array('del', 'ins'); - var $info = array(); var $content_sets = array('Inline' => 'del | ins'); function HTMLPurifier_HTMLModule_Edit() { diff --git a/library/HTMLPurifier/HTMLModule/Hypertext.php b/library/HTMLPurifier/HTMLModule/Hypertext.php index e285e8ba..baa20fd1 100644 --- a/library/HTMLPurifier/HTMLModule/Hypertext.php +++ b/library/HTMLPurifier/HTMLModule/Hypertext.php @@ -11,7 +11,6 @@ class HTMLPurifier_HTMLModule_Hypertext extends HTMLPurifier_HTMLModule var $name = 'Hypertext'; var $elements = array('a'); - var $info = array(); var $content_sets = array('Inline' => 'a'); function HTMLPurifier_HTMLModule_Hypertext() { diff --git a/library/HTMLPurifier/HTMLModule/Image.php b/library/HTMLPurifier/HTMLModule/Image.php index 3852836d..bf234b13 100644 --- a/library/HTMLPurifier/HTMLModule/Image.php +++ b/library/HTMLPurifier/HTMLModule/Image.php @@ -15,7 +15,6 @@ class HTMLPurifier_HTMLModule_Image extends HTMLPurifier_HTMLModule var $name = 'Image'; var $elements = array('img'); - var $info = array(); var $content_sets = array('Inline' => 'img'); function HTMLPurifier_HTMLModule_Image() { diff --git a/library/HTMLPurifier/HTMLModule/List.php b/library/HTMLPurifier/HTMLModule/List.php index c74982df..f9f2c4e2 100644 --- a/library/HTMLPurifier/HTMLModule/List.php +++ b/library/HTMLPurifier/HTMLModule/List.php @@ -10,7 +10,7 @@ class HTMLPurifier_HTMLModule_List extends HTMLPurifier_HTMLModule var $name = 'List'; var $elements = array('dl', 'dt', 'dd', 'ol', 'ul', 'li'); - var $info = array(); + // According to the abstract schema, the List content set is a fully formed // one or more expr, but it invariably occurs in an optional declaration // so we're not going to do that subtlety. It might cause trouble diff --git a/library/HTMLPurifier/HTMLModule/Presentation.php b/library/HTMLPurifier/HTMLModule/Presentation.php index 42d9c11e..5c80db40 100644 --- a/library/HTMLPurifier/HTMLModule/Presentation.php +++ b/library/HTMLPurifier/HTMLModule/Presentation.php @@ -17,7 +17,6 @@ class HTMLPurifier_HTMLModule_Presentation extends HTMLPurifier_HTMLModule var $name = 'Presentation'; var $elements = array('b', 'big', 'hr', 'i', 'small', 'sub', 'sup', 'tt'); - var $info = array(); var $content_sets = array( 'Block' => 'hr', 'Inline' => 'b | big | i | small | sub | sup | tt' diff --git a/library/HTMLPurifier/HTMLModule/Tables.php b/library/HTMLPurifier/HTMLModule/Tables.php index ea41f5b1..003ff624 100644 --- a/library/HTMLPurifier/HTMLModule/Tables.php +++ b/library/HTMLPurifier/HTMLModule/Tables.php @@ -12,7 +12,6 @@ class HTMLPurifier_HTMLModule_Tables extends HTMLPurifier_HTMLModule var $name = 'Tables'; var $elements = array('caption', 'table', 'td', 'th', 'tr', 'col', 'colgroup', 'tbody', 'thead', 'tfoot'); - var $info = array(); var $content_sets = array('Block' => 'table'); function HTMLPurifier_HTMLModule_Tables() { diff --git a/library/HTMLPurifier/HTMLModule/Text.php b/library/HTMLPurifier/HTMLModule/Text.php index 56361a39..64b6e110 100644 --- a/library/HTMLPurifier/HTMLModule/Text.php +++ b/library/HTMLPurifier/HTMLModule/Text.php @@ -22,8 +22,6 @@ class HTMLPurifier_HTMLModule_Text extends HTMLPurifier_HTMLModule 'h4', 'h5', 'h6', 'kbd', 'p', 'pre', 'q', 'samp', 'span', 'strong', 'var'); - var $info = array(); - var $content_sets = array( 'Heading' => 'h1 | h2 | h3 | h4 | h5 | h6', 'Block' => 'address | blockquote | div | p | pre',