gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-12 12:41:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Uwe Steinmann 2021-06-14 17:20:39 +02:00
commit eeb3422e8a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
views/bootstrap/class.Search.php
View File

@ -303,7 +303,7 @@ function typeahead() { /* {{{ */
); );
$options = array(); $options = array();
foreach ($allUsers as $currUser) { foreach ($allUsers as $currUser) {
if($user->isAdmin() || (!$currUser->isGuest() && (!$currObj->isHidden() || $currObj->getID() == $user->getID()))) if($user->isAdmin() || (!$currUser->isGuest() && (!$currUser->isHidden() || $currUser->getID() == $user->getID())))
$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()), in_array($currUser->getID(), $owner), array(array('data-subtitle', htmlspecialchars($currUser->getFullName())))); $options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()), in_array($currUser->getID(), $owner), array(array('data-subtitle', htmlspecialchars($currUser->getFullName()))));
} }
$this->formField( $this->formField(
@ -537,7 +537,7 @@ function typeahead() { /* {{{ */
if(!isset($facets['owner'])) { if(!isset($facets['owner'])) {
$options = array(); $options = array();
foreach ($allUsers as $currUser) { foreach ($allUsers as $currUser) {
if($user->isAdmin() || (!$currUser->isGuest() && (!$currObj->isHidden() || $currObj->getID() == $user->getID()))) if($user->isAdmin() || (!$currUser->isGuest() && (!$currUser->isHidden() || $currUser->getID() == $user->getID())))
$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()), in_array($currUser->getID(), $owner), array(array('data-subtitle', htmlspecialchars($currUser->getFullName())))); $options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()), in_array($currUser->getID(), $owner), array(array('data-subtitle', htmlspecialchars($currUser->getFullName()))));
} }
$this->formField( $this->formField(
@ -631,7 +631,6 @@ foreach($facets as $facetname=>$values) {
?> ?>
</div> </div>
<?php <?php
echo "</div>";
$this->columnEnd(); $this->columnEnd();
$this->columnStart(8); $this->columnStart(8);
$this->contentHeading(getMLText('search_results')); $this->contentHeading(getMLText('search_results'));