Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -396,9 +396,9 @@ public function renderQuickInteractions(DatabaseObject $row): string
*
* @param TDatabaseObject $row
*/
protected function getData(DatabaseObject $row, string $identifer): mixed
protected function getData(DatabaseObject $row, string $identifier): mixed
{
return $row->__get($identifer);
return $row->__get($identifier);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,9 @@ protected function invokeNodeHandlers($classNamePattern, array $skipTags = [], ?
* Returns a randomly generated tagName+identifier pair for <wcfNode-*> tags.
*
* @return array{0: string, 1: string}
* @since 6.2
*/
public function getWcfNodeIdentifer(): array
public function getWcfNodeIdentifier(): array
{
static $counter = 0;
static $prefix = null;
Expand All @@ -435,4 +436,15 @@ public function getWcfNodeIdentifer(): array

return [$identifier, "wcfNode-{$identifier}"];
}

/**
* Returns a randomly generated tagName+identifier pair for <wcfNode-*> tags.
*
* @return array{0: string, 1: string}
* @deprecated 6.2 Use `getWcfNodeIdentifier` instead.
*/
public function getWcfNodeIdentifer(): array
{
return $this->getWcfNodeIdentifier();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function process(array $elements, AbstractHtmlNodeProcessor $htmlNodeProc
/** @var \DOMElement $element */
foreach ($elements as $element) {
if ($element->getAttribute('class') === 'woltlabHtml') {
[$nodeIdentifier, $tagName] = $htmlNodeProcessor->getWcfNodeIdentifer();
[$nodeIdentifier, $tagName] = $htmlNodeProcessor->getWcfNodeIdentifier();
$htmlNodeProcessor->addNodeData($this, $nodeIdentifier, ['rawHTML' => $element->textContent]);

$htmlNodeProcessor->renameTag($element, $tagName);
Expand All @@ -51,7 +51,7 @@ public function process(array $elements, AbstractHtmlNodeProcessor $htmlNodeProc
$prefix = '';
// Create a unique prefix if possible
$prefix = \str_replace('.', '_', $context['objectType']) . '_' . $context['objectID'] . '_';
[$nodeIdentifier, $tagName] = $htmlNodeProcessor->getWcfNodeIdentifer();
[$nodeIdentifier, $tagName] = $htmlNodeProcessor->getWcfNodeIdentifier();
$htmlNodeProcessor->addNodeData($this, $nodeIdentifier, [
'content' => $element->textContent,
'file' => $element->getAttribute('data-file'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function process(array $elements, AbstractHtmlNodeProcessor $htmlNodeProc
$name = $element->getAttribute('data-name');
$attributes = $element->getAttribute('data-attributes');

[$nodeIdentifier, $tagName] = $htmlNodeProcessor->getWcfNodeIdentifer();
[$nodeIdentifier, $tagName] = $htmlNodeProcessor->getWcfNodeIdentifier();

$element = $htmlNodeProcessor->renameTag($element, $tagName);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function process(array $elements, AbstractHtmlNodeProcessor $htmlNodeProc
$link = WCF::getPath() . $link;
}

[$nodeIdentifier, $tagName] = $htmlNodeProcessor->getWcfNodeIdentifer();
[$nodeIdentifier, $tagName] = $htmlNodeProcessor->getWcfNodeIdentifier();
$htmlNodeProcessor->addNodeData($this, $nodeIdentifier, [
'author' => $element->getAttribute('data-author'),
'collapse' => $collapse,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function process(array $elements, AbstractHtmlNodeProcessor $htmlNodeProc
/** @var \DOMElement $element */
foreach ($elements as $element) {
if ($this->outputType === 'text/html') {
[$nodeIdentifier, $tagName] = $htmlNodeProcessor->getWcfNodeIdentifer();
[$nodeIdentifier, $tagName] = $htmlNodeProcessor->getWcfNodeIdentifier();
$htmlNodeProcessor->addNodeData(
$this,
$nodeIdentifier,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function process(array $elements, AbstractHtmlNodeProcessor $htmlNodeProc
$enableUgc = $processor->enableUgc;
}

[$nodeIdentifier, $tagName] = $htmlNodeProcessor->getWcfNodeIdentifer();
[$nodeIdentifier, $tagName] = $htmlNodeProcessor->getWcfNodeIdentifier();
$htmlNodeProcessor->addNodeData($this, $nodeIdentifier, [
'urlId' => $attribute,
'enableUgc' => $enableUgc,
Expand Down
Loading