aboutsummaryrefslogtreecommitdiffstats
path: root/library/HTML5/TreeBuilder.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2011-11-18 22:04:41 -0800
committerfriendica <info@friendica.com>2011-11-18 22:04:41 -0800
commitfd4fe24406edb277814c7a45a6094a8eec0850d7 (patch)
tree7db5bceb30a569b035c600313a9dbbf66b14abac /library/HTML5/TreeBuilder.php
parent485f97b3d8937f219e2b9f3c662ee0e1966130eb (diff)
parent6893df991edfe971871a5db45055b40b871a7a4f (diff)
downloadvolse-hubzilla-fd4fe24406edb277814c7a45a6094a8eec0850d7.tar.gz
volse-hubzilla-fd4fe24406edb277814c7a45a6094a8eec0850d7.tar.bz2
volse-hubzilla-fd4fe24406edb277814c7a45a6094a8eec0850d7.zip
Merge branch 'master' into groups
Diffstat (limited to 'library/HTML5/TreeBuilder.php')
-rw-r--r--library/HTML5/TreeBuilder.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/library/HTML5/TreeBuilder.php b/library/HTML5/TreeBuilder.php
index 10d446d1e..578e73682 100644
--- a/library/HTML5/TreeBuilder.php
+++ b/library/HTML5/TreeBuilder.php
@@ -3041,9 +3041,13 @@ class HTML5_TreeBuilder {
if (!empty($token['attr'])) {
foreach($token['attr'] as $attr) {
- // mike@macgirvin.com 2011-10-21, stray double quotes and/or numeric tags cause everything to abort
- $attr['name'] = str_replace('"','',$attr['name']);
- if($attr['name'] && (!$el->hasAttribute($attr['name'])) && (! is_numeric($attr['name']))) {
+
+ // mike@macgirvin.com 2011-11-17, check attribute name for
+ // validity (ignoring extenders and combiners) as illegal chars in names
+ // causes everything to abort
+
+ $valid = preg_match('/^[a-zA-Z\_\:]([\-a-zA-Z0-9\_\:\.]+$)/',$attr['name'],$matches);
+ if($attr['name'] && (!$el->hasAttribute($attr['name'])) && ($valid)) {
$el->setAttribute($attr['name'], $attr['value']);
}
}