X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FBaseSearch.php;h=3497ad9b1d945365bee0e9bbc3bf2cfb355d2422;hb=036b565a7846916f763ce1dcbcaade0844ff1589;hp=77abae007acadc77d12cfc4ba3c37a6ef0970991;hpb=ce7f192f35cb0493c96283fac701d51bd30dc777;p=friendica.git

diff --git a/src/Module/BaseSearch.php b/src/Module/BaseSearch.php
index 77abae007a..3497ad9b1d 100644
--- a/src/Module/BaseSearch.php
+++ b/src/Module/BaseSearch.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -30,6 +30,7 @@ use Friendica\Model;
 use Friendica\Network\HTTPException;
 use Friendica\Object\Search\ContactResult;
 use Friendica\Object\Search\ResultList;
+use Friendica\Util\Network;
 
 /**
  * Base class for search modules
@@ -48,7 +49,6 @@ class BaseSearch extends BaseModule
 	 */
 	public static function performContactSearch($search, $prefix = '')
 	{
-		$a      = DI::app();
 		$config = DI::config();
 
 		$type = Search::TYPE_ALL;
@@ -69,7 +69,7 @@ class BaseSearch extends BaseModule
 			$header  = DI::l10n()->t('People Search - %s', $search);
 
 			if (strrpos($search, '@') > 0) {
-				$results = Search::getContactsFromProbe($search);
+				$results = Search::getContactsFromProbe(Network::convertToIdn($search));
 			}
 		}
 
@@ -79,6 +79,8 @@ class BaseSearch extends BaseModule
 			$header = DI::l10n()->t('Forum Search - %s', $search);
 		}
 
+		$search = Network::convertToIdn($search);
+
 		if (DI::mode()->isMobile()) {
 			$itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
 				DI::config()->get('system', 'itemspage_network_mobile'));
@@ -92,7 +94,7 @@ class BaseSearch extends BaseModule
 		if ($localSearch && empty($results)) {
 			$pager->setItemsPerPage(80);
 			$results = Search::getContactsFromLocalDirectory($search, $type, $pager->getStart(), $pager->getItemsPerPage());
-		} elseif (strlen($config->get('system', 'directory')) && empty($results)) {
+		} elseif (Search::getGlobalDirectory() && empty($results)) {
 			$results = Search::getContactsFromGlobalDirectory($search, $type, $pager->getPage());
 			$pager->setItemsPerPage($results->getItemsPage());
 		}