Rename BaseSearchModule::performSearch to performContactSearch to remove purpose...

diff --git a/src/Module/BaseSearchModule.php b/src/Module/BaseSearchModule.php
index 9766c000cca8b4926d87de07b038b3a3df5f04fd..96692b0b2d68c355e8cf9ed41a999b224d6c4f20 100644 (file)
--- a/src/Module/BaseSearchModule.php
+++ b/src/Module/BaseSearchModule.php
@@ -22,7 +22,7 @@ use Friendica\Util\Strings;
 class BaseSearchModule extends BaseModule
 {
        /**
-        * Performs a search with an optional prefix
+        * Performs a contact search with an optional prefix
         *
         * @param string $search Search query
         * @param string $prefix A optional prefix (e.g. @ or !) for searching
@@ -31,7 +31,7 @@ class BaseSearchModule extends BaseModule
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function performSearch($search, $prefix = '')
+       public static function performContactSearch($search, $prefix = '')
        {
                $a      = self::getApp();
                $config = $a->getConfig();

diff --git a/src/Module/Search/Directory.php b/src/Module/Search/Directory.php
index b18847afe9b41edb629a292c2a635208b582a717..e3515713f55a57d10d05766951926534e6ae50d0 100644 (file)
--- a/src/Module/Search/Directory.php
+++ b/src/Module/Search/Directory.php
@@ -31,6 +31,6 @@ class Directory extends BaseSearchModule
                $a->page['aside'] .= Widget::findPeople();
                $a->page['aside'] .= Widget::follow();
 
-               return self::performSearch($search);
+               return self::performContactSearch($search);
        }
 }

diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index 7c52c7e79de1d07f188dccd5531835e6ca82226f..8921c07aa60edf919bcf136fafacb117ac83068b 100644 (file)
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -88,7 +88,7 @@ class Index extends BaseSearchModule
                }
 
                if (strpos($search, '@') === 0 || strpos($search, '!') === 0) {
-                       return self::performSearch($search);
+                       return self::performContactSearch($search);
                }
 
                if (parse_url($search, PHP_URL_SCHEME) != '') {
@@ -109,9 +109,9 @@ class Index extends BaseSearchModule
                                        $tag = true;
                                        break;
                                case 'contacts':
-                                       return self::performSearch($search, '@');
+                                       return self::performContactSearch($search, '@');
                                case 'forums':
-                                       return self::performSearch($search, '!');
+                                       return self::performContactSearch($search, '!');
                        }
                }