From 3c4346cb1e6b148019d627d6bf3672c930ed423f Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <edwardzyang@thewritingpot.com>
Date: Mon, 26 May 2008 04:35:12 +0000
Subject: [PATCH] Fix back-compat regressions. Also, compactify configuration
 code.

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1771 48356398-32a2-884e-a903-53898d9a118a
---
 library/HTMLPurifier/AttrDef/CSS/FontFamily.php |  2 +-
 library/HTMLPurifier/Config.php                 | 33 +++++++++++--------------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/library/HTMLPurifier/AttrDef/CSS/FontFamily.php b/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
index 6bbf9b8c..22f4c6de 100644
--- a/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
+++ b/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
@@ -65,7 +65,7 @@ class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
             }
             // $font is a pure representation of the font name
             
-            if (ctype_alnum($font)) {
+            if (ctype_alnum($font) && $font !== '') {
                 // very simple font, allow it in unharmed
                 $final .= $font . ', ';
                 continue;
diff --git a/library/HTMLPurifier/Config.php b/library/HTMLPurifier/Config.php
index 66478b03..68ec8d20 100644
--- a/library/HTMLPurifier/Config.php
+++ b/library/HTMLPurifier/Config.php
@@ -196,14 +196,16 @@ class HTMLPurifier_Config
                 E_USER_WARNING);
             return;
         }
-        if (isset($this->def->info[$namespace][$key]->isAlias)) {
+        $def = $this->def->info[$namespace][$key];
+        
+        if (isset($def->isAlias)) {
             if ($from_alias) {
                 trigger_error('Double-aliases not allowed, please fix '.
                     'ConfigSchema bug with' . "$namespace.$key", E_USER_ERROR);
                 return;
             }
-            $this->set($new_ns = $this->def->info[$namespace][$key]->namespace,
-                       $new_dir = $this->def->info[$namespace][$key]->name,
+            $this->set($new_ns  = $def->namespace,
+                       $new_dir = $def->name,
                        $value, true);
             trigger_error("$namespace.$key is an alias, preferred directive name is $new_ns.$new_dir", E_USER_NOTICE);
             return;
@@ -211,16 +213,13 @@ class HTMLPurifier_Config
         
         // Raw type might be negative when using the fully optimized form
         // of stdclass, which indicates allow_null == true
-        $rtype =
-            is_int($this->def->info[$namespace][$key]) ?
-            $this->def->info[$namespace][$key] :
-            $this->def->info[$namespace][$key]->type;
+        $rtype = is_int($def) ? $def : $def->type;
         if ($rtype < 0) {
             $type = -$rtype;
             $allow_null = true;
         } else {
             $type = $rtype;
-            $allow_null = isset($this->def->info[$namespace][$key]->allow_null);
+            $allow_null = isset($def->allow_null);
         }
         
         try {
@@ -229,18 +228,16 @@ class HTMLPurifier_Config
             trigger_error('Value for ' . "$namespace.$key" . ' is of invalid type, should be ' . HTMLPurifier_VarParser::getTypeName($type), E_USER_WARNING);
             return;
         }
-        if (is_string($value)) {
+        if (is_string($value) && is_object($def)) {
             // resolve value alias if defined
-            if (isset($this->def->info[$namespace][$key]->aliases[$value])) {
-                $value = $this->def->info[$namespace][$key]->aliases[$value];
+            if (isset($def->aliases[$value])) {
+                $value = $def->aliases[$value];
             }
-            if (isset($this->def->info[$namespace][$key])) {
-                // check to see if the value is allowed
-                if (isset($this->def->info[$namespace][$key]->allowed) && !isset($this->def->info[$namespace][$key]->allowed[$value])) {
-                    trigger_error('Value not supported, valid values are: ' .
-                        $this->_listify($this->def->info[$namespace][$key]->allowed), E_USER_WARNING);
-                    return;
-                }
+            // check to see if the value is allowed
+            if (isset($def->allowed) && !isset($def->allowed[$value])) {
+                trigger_error('Value not supported, valid values are: ' .
+                    $this->_listify($def->allowed), E_USER_WARNING);
+                return;
             }
         }
         $this->conf[$namespace][$key] = $value;
-- 
2.11.4.GIT