tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Split Directory Search as a base for further changes

Browse source
This commit is contained in:
Philipp Holzer 2019-05-19 05:06:02 +02:00
commit a7aae9603a
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
3 changed files with 60 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mod/search.php
View file

@ -14,7 +14,7 @@ use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\Model\Item;
use Friendica\Module\Directory;
use Friendica\Module\BaseSearchModule;
use Friendica\Util\Strings;
function search_saved_searches() {
@ -148,10 +148,10 @@ function search_content(App $a) {
$search = substr($search,1);
}
if (strpos($search,'@') === 0) {
return Directory::performSearch();
return BaseSearchModule::performSearch();
}
if (strpos($search,'!') === 0) {
return Directory::performSearch();
return BaseSearchModule::performSearch();
}
if (!empty($_GET['search-option']))
@ -162,9 +162,9 @@ function search_content(App $a) {
$tag = true;
break;
case 'contacts':
return Directory::performSearch('@');
return BaseSearchModule::performSearch('@');
case 'forums':
return Directory::performSearch('!');
return BaseSearchModule::performSearch('!');
}
if (!$search)