Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

This commit is contained in:
Uwe Steinmann 2022-08-18 13:21:53 +02:00
commit 751918ef17
2 changed files with 0 additions and 16 deletions

View File

@ -49,8 +49,6 @@ if (isset($_GET["navBar"])) {
} }
} }
$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
$includecontent = false; $includecontent = false;
if (isset($_GET["includecontent"]) && $_GET["includecontent"]) if (isset($_GET["includecontent"]) && $_GET["includecontent"])
$includecontent = true; $includecontent = true;

View File

@ -240,20 +240,6 @@ function typeahead() { /* {{{ */
$reception = $this->params['reception']; $reception = $this->params['reception'];
$showsinglesearchhit = $this->params['showsinglesearchhit']; $showsinglesearchhit = $this->params['showsinglesearchhit'];
if($showsinglesearchhit && count($entries) == 1) {
$entry = $entries[0];
if($entry->isType('document')) {
header('Location: ../out/out.ViewDocument.php?documentid='.$entry->getID());
exit;
} elseif($entry->isType('folder')) {
header('Location: ../out/out.ViewFolder.php?folderid='.$entry->getID());
exit;
}
}
// if ($pageNumber != 'all')
// $entries = array_slice($entries, ($pageNumber-1)*$limit, $limit);
$this->htmlStartPage(getMLText("search_results")); $this->htmlStartPage(getMLText("search_results"));
$this->globalNavigation(); $this->globalNavigation();
$this->contentStart(); $this->contentStart();