Commit b2a308d2 authored by kroky6's avatar kroky6

[MRG] Automatic merge, branches/16.x 60236 to 60241

parents dbd4e0a9 a83771f5
......@@ -83,7 +83,7 @@ class Search_Indexer
public function update(array $objectList)
{
foreach (array_unique($objectList) as $object) {
foreach (array_unique($objectList, SORT_REGULAR) as $object) {
$this->searchIndex->invalidateMultiple(array($object));
$this->addDocument($object['object_type'], $object['object_id']);
}
......
......@@ -100,6 +100,18 @@ function wikiplugin_listexecute($data, $params)
$formatter = $builder->getFormatter();
if( !$customOutput ) {
$plugin = new Search_Formatter_Plugin_SmartyTemplate('templates/wiki-plugins/wikiplugin_listexecute.tpl');
$plugin->setFields(array('report_status' => null));
$plugin->setData(
array(
'actions' => array_keys($actions),
'iListExecute' => $iListExecute
)
);
$formatter = new Search_Formatter($plugin);
}
if (isset($_POST['list_action'], $_POST['objects'])) {
$action = $_POST['list_action'];
$objects = (array) $_POST['objects'];
......@@ -130,17 +142,5 @@ function wikiplugin_listexecute($data, $params)
}
}
if( !$customOutput ) {
$plugin = new Search_Formatter_Plugin_SmartyTemplate('templates/wiki-plugins/wikiplugin_listexecute.tpl');
$plugin->setFields(array('report_status' => null));
$plugin->setData(
array(
'actions' => array_keys($actions),
'iListExecute' => $iListExecute
)
);
$formatter = new Search_Formatter($plugin);
}
return $formatter->format($result);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment