X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FBaseSearchModule.php;h=9766c000cca8b4926d87de07b038b3a3df5f04fd;hb=36ba7fa79c7c2d4304f3423d84215771e3bb6a9f;hp=3393b34123923fe05669a5004ca51093ae85f2b0;hpb=5c2cca432fe6b310df4bcf8dd1f002f5096693c0;p=friendica.git

diff --git a/src/Module/BaseSearchModule.php b/src/Module/BaseSearchModule.php
index 3393b34123..9766c000cc 100644
--- a/src/Module/BaseSearchModule.php
+++ b/src/Module/BaseSearchModule.php
@@ -2,6 +2,7 @@
 
 namespace Friendica\Module;
 
+use Friendica\App\Arguments;
 use Friendica\BaseModule;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Pager;
@@ -23,13 +24,14 @@ class BaseSearchModule extends BaseModule
 	/**
 	 * Performs a search with an optional prefix
 	 *
+	 * @param string $search Search query
 	 * @param string $prefix A optional prefix (e.g. @ or !) for searching
 	 *
 	 * @return string
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function performSearch($prefix = '')
+	public static function performSearch($search, $prefix = '')
 	{
 		$a      = self::getApp();
 		$config = $a->getConfig();
@@ -38,7 +40,7 @@ class BaseSearchModule extends BaseModule
 
 		$localSearch = $config->get('system', 'poco_local_search');
 
-		$search = $prefix . Strings::escapeTags(trim(defaults($_REQUEST, 'search', '')));
+		$search = $prefix . $search;
 
 		if (!$search) {
 			return '';
@@ -50,7 +52,10 @@ class BaseSearchModule extends BaseModule
 			$search  = substr($search, 1);
 			$type    = Search::TYPE_PEOPLE;
 			$header  = L10n::t('People Search - %s', $search);
-			$results = Search::getContactsFromProbe($search);
+
+			if (strrpos($search, '@') > 0) {
+				$results = Search::getContactsFromProbe($search);
+			}
 		}
 
 		if (strpos($search, '!') === 0) {
@@ -59,7 +64,9 @@ class BaseSearchModule extends BaseModule
 			$header = L10n::t('Forum Search - %s', $search);
 		}
 
-		$pager = new Pager($a->query_string);
+		/** @var Arguments $args */
+		$args = self::getClass(Arguments::class);
+		$pager = new Pager($args->getQueryString());
 
 		if ($localSearch && empty($results)) {
 			$pager->setItemsPerPage(80);