Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Metadata render fix #660

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Metadata render fix #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ class helper_plugin_struct extends DokuWiki_Plugin
* All descendants are also blacklisted.
*/
public const BLACKLIST_RENDERER = [
'Doku_Renderer_metadata',
'\renderer_plugin_qc'
];

Expand Down
5 changes: 3 additions & 2 deletions meta/SearchConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,9 @@ protected function applyFilterVars($filter)
{
global $INPUT;
global $INFO;
if (!isset($INFO['id'])) {
$INFO['id'] = null;

if (is_null($INFO)) {
$INFO = pageinfo();
}

// apply inexpensive filters first
Expand Down
22 changes: 17 additions & 5 deletions syntax/output.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

class syntax_plugin_struct_output extends DokuWiki_Syntax_Plugin
{
protected $hasBeenRendered = false;
protected $hasBeenRendered = array('metadata'=>false, 'xhtml'=>false);

protected const XHTML_OPEN = '<div id="plugin__struct_output">';
protected const XHTML_CLOSE = '</div>';
Expand Down Expand Up @@ -97,13 +97,25 @@ public function render($format, Doku_Renderer $renderer, $data)
return true;
}
}
if (!isset($INFO['id']) || ($ID != $INFO['id'])) return true;
if (!$INFO['exists']) return true;
if ($this->hasBeenRendered) return true;
if (!isset($INFO) || $format == "metadata") {
$pagename = pageinfo()['id'];
} else {
$pagename = $INFO['id'];
}

if ($ID != $pagename) return true;
if (!page_exists($pagename)) return true;
if ($this->hasBeenRendered['metadata'] && $format == 'metadata') return true;
if ($this->hasBeenRendered['xhtml'] && $format == 'xhtml') return true;
if (!preg_match(self::WHITELIST_ACTIONS, act_clean($ACT))) return true;

// do not render the output twice on the same page, e.g. when another page has been included
$this->hasBeenRendered = true;
if ($format == 'metadata') {
$this->hasBeenRendered['metadata'] = true;
}
else if ($format == 'xhtml') {
$this->hasBeenRendered['xhtml'] = true;
}
try {
$assignments = Assignments::getInstance();
} catch (StructException $e) {
Expand Down
15 changes: 10 additions & 5 deletions syntax/table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,14 @@ public function render($format, Doku_Renderer $renderer, $config)
}

try {
$search = $this->getSearchConfig($config);
if ($format === 'struct_csv') {
// no pagination in export
if ($format === "metadata") {
$search = $this->getSearchConfig($config, false);
} else {
$search = $this->getSearchConfig($config);
}

if ($format === 'struct_csv' || $format === "metadata") {
// no pagination in export or metadata render
$search->setLimit(0);
$search->setOffset(0);
}
Expand Down Expand Up @@ -139,9 +144,9 @@ public function render($format, Doku_Renderer $renderer, $config)
* @param array $config
* @return SearchConfig
*/
protected function getSearchConfig($config)
protected function getSearchConfig($config, $dymamic = true)
{
return new SearchConfig($config);
return new SearchConfig($config, $dymamic);
}


Expand Down
Loading