| @@ -685,10 +685,9 @@ | ||
| 685 | 685 | // Notice the \[ starting the attbute? and the @? following? This implies that an attribute can begin with an @ sign that is not captured. |
| 686 | 686 | // This implies that an html attribute specifier may start with an @ sign that is NOT captured by the expression. |
| 687 | 687 | // farther study is required to determine of this should be documented or removed. |
| 688 | 688 | // $pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is"; |
| 689 | -// $pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-:]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is"; | |
| 690 | - $pattern = "/([\w\-:\*]*)(?:\#([\w\-]+)|\.([\w\-]+))?(?:\[@?(!?[\w\-:]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is"; | |
| 689 | + $pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-:]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is"; | |
| 691 | 690 | preg_match_all($pattern, trim($selector_string).' ', $matches, PREG_SET_ORDER); |
| 692 | 691 | if (is_object($debug_object)) {$debug_object->debug_log(2, "Matches Array: ", $matches);} |
| 693 | 692 | |
| 694 | 693 | $selectors = array(); |
| @@ -1382,11 +1381,9 @@ | ||
| 1382 | 1381 | $this->char = $this->doc[--$this->pos]; // prev |
| 1383 | 1382 | return true; |
| 1384 | 1383 | } |
| 1385 | 1384 | |
| 1386 | -// /^[\w-:]+$/ | |
| 1387 | - | |
| 1388 | - if (!preg_match("/^[\w\-:]+$/", $tag)) { | |
| 1385 | + if (!preg_match("/^[\w-:]+$/", $tag)) { | |
| 1389 | 1386 | $node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until('<>'); |
| 1390 | 1387 | if ($this->char==='<') { |
| 1391 | 1388 | $this->link_nodes($node, false); |
| 1392 | 1389 | return true; |
