Update to Drupal 8.1.5. For more information, see https://www.drupal.org/project/drupal/releases/8.1.5
This commit is contained in:
parent
13b6ca7cc2
commit
38ba7c357d
342 changed files with 7814 additions and 1534 deletions
|
@ -24,7 +24,7 @@ class Elements
|
|||
const KNOWN_ELEMENT = 1;
|
||||
|
||||
// From section 8.1.2: "script", "style"
|
||||
// From 8.2.5.4.7 ("in body" insertion mode): "noembed", "noscript"
|
||||
// From 8.2.5.4.7 ("in body" insertion mode): "noembed"
|
||||
// From 8.4 "style", "xmp", "iframe", "noembed", "noframes"
|
||||
/**
|
||||
* Indicates the contained text should be processed as raw text.
|
||||
|
@ -79,7 +79,7 @@ class Elements
|
|||
public static $html5 = array(
|
||||
"a" => 1,
|
||||
"abbr" => 1,
|
||||
"address" => 89, // NORMAL | VOID_TAG | AUTOCLOSE_P | BLOCK_TAG
|
||||
"address" => 65, // NORMAL | BLOCK_TAG
|
||||
"area" => 9, // NORMAL | VOID_TAG
|
||||
"article" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
|
||||
"aside" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
|
||||
|
@ -144,7 +144,7 @@ class Elements
|
|||
"meta" => 9, // NORMAL | VOID_TAG
|
||||
"meter" => 1,
|
||||
"nav" => 17, // NORMAL | AUTOCLOSE_P,
|
||||
"noscript" => 67, // NORMAL | TEXT_RAW | BLOCK_TAG
|
||||
"noscript" => 65, // NORMAL | BLOCK_TAG
|
||||
"object" => 1,
|
||||
"ol" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
|
||||
"optgroup" => 1,
|
||||
|
@ -557,7 +557,7 @@ class Elements
|
|||
* @param string $name
|
||||
* The name of the element.
|
||||
*
|
||||
* @return int The element mask.
|
||||
* @return int|bool The element mask or false if element does not exist.
|
||||
*/
|
||||
public static function element($name)
|
||||
{
|
||||
|
|
|
@ -69,7 +69,7 @@ interface EventHandler
|
|||
* An array with all of the tag's attributes.
|
||||
* @param boolean $selfClosing
|
||||
* An indicator of whether or not this tag is self-closing (<foo/>)
|
||||
* @return numeric One of the Tokenizer::TEXTMODE_* constants.
|
||||
* @return int One of the Tokenizer::TEXTMODE_* constants.
|
||||
*/
|
||||
public function startTag($name, $attributes = array(), $selfClosing = false);
|
||||
|
||||
|
|
|
@ -299,7 +299,7 @@ class Tokenizer
|
|||
}
|
||||
|
||||
elseif ($tok == 'D' || $tok == 'd') { // Doctype
|
||||
return $this->doctype('');
|
||||
return $this->doctype();
|
||||
}
|
||||
|
||||
elseif ($tok == '[') { // CDATA section
|
||||
|
|
|
@ -48,10 +48,10 @@ class UTF8Utils
|
|||
public static function countChars($string)
|
||||
{
|
||||
// Get the length for the string we need.
|
||||
if (function_exists('iconv_strlen')) {
|
||||
return iconv_strlen($string, 'utf-8');
|
||||
} elseif (function_exists('mb_strlen')) {
|
||||
if (function_exists('mb_strlen')) {
|
||||
return mb_strlen($string, 'utf-8');
|
||||
} elseif (function_exists('iconv_strlen')) {
|
||||
return iconv_strlen($string, 'utf-8');
|
||||
} elseif (function_exists('utf8_decode')) {
|
||||
// MPB: Will this work? Won't certain decodes lead to two chars
|
||||
// extrapolated out of 2-byte chars?
|
||||
|
@ -94,10 +94,10 @@ class UTF8Utils
|
|||
// application executing this library so we store the value, change it
|
||||
// to our needs, and then change it back when we are done. This feels
|
||||
// a little excessive and it would be great if there was a better way.
|
||||
$save = ini_get('mbstring.substitute_character');
|
||||
ini_set('mbstring.substitute_character', "none");
|
||||
$save = mb_substitute_character();
|
||||
mb_substitute_character('none');
|
||||
$data = mb_convert_encoding($data, 'UTF-8', $encoding);
|
||||
ini_set('mbstring.substitute_character', $save);
|
||||
mb_substitute_character($save);
|
||||
} // @todo Get iconv running in at least some environments if that is possible.
|
||||
elseif (function_exists('iconv') && $encoding != 'auto') {
|
||||
// fprintf(STDOUT, "iconv found\n");
|
||||
|
|
|
@ -185,7 +185,9 @@ class OutputRules implements \Masterminds\HTML5\Serializer\RulesInterface
|
|||
{
|
||||
$this->doctype();
|
||||
if ($dom->documentElement) {
|
||||
$this->traverser->node($dom->documentElement);
|
||||
foreach ($dom->childNodes as $node) {
|
||||
$this->traverser->node($node);
|
||||
}
|
||||
$this->nl();
|
||||
}
|
||||
}
|
||||
|
@ -347,7 +349,7 @@ class OutputRules implements \Masterminds\HTML5\Serializer\RulesInterface
|
|||
// the XML, XMLNS, or XLink NS's should use the canonical
|
||||
// prefix. It seems that DOM does this for us already, but there
|
||||
// may be exceptions.
|
||||
$name = $node->name;
|
||||
$name = $node->nodeName;
|
||||
|
||||
// Special handling for attributes in SVG and MathML.
|
||||
// Using if/elseif instead of switch because it's faster in PHP.
|
||||
|
|
|
@ -103,7 +103,6 @@ class Traverser
|
|||
case XML_CDATA_SECTION_NODE:
|
||||
$this->rules->cdata($node);
|
||||
break;
|
||||
// FIXME: It appears that the parser doesn't do PI's.
|
||||
case XML_PI_NODE:
|
||||
$this->rules->processorInstruction($node);
|
||||
break;
|
||||
|
|
Reference in a new issue