This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.1 has been updated
via af41fb2cd36ada95b9552816a4ab52c03fdb2bad (commit)
from a968e77ead49595fa202880e167cd0579cdbf89b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=af41fb2cd36ada95b9552816a4ab52c03fdb2bad
commit af41fb2cd36ada95b9552816a4ab52c03fdb2bad
Author: Franck Villaume <[email protected]>
Date: Sun Apr 28 20:23:30 2019 +0200
fix [#908]: PHP notice message in SearchManager
diff --git a/src/www/search/include/SearchManager.class.php
b/src/www/search/include/SearchManager.class.php
index 93cce64..8a45e15 100644
--- a/src/www/search/include/SearchManager.class.php
+++ b/src/www/search/include/SearchManager.class.php
@@ -4,6 +4,7 @@
*
* Copyright 2004 (c) Guillaume Smet
* Copyright 2011, Franck Villaume - Capgemini
+ * Copyright 2019, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -96,72 +97,87 @@ class SearchManager {
function loadSearchEngines() {
// Specific search engines
+ $artifactSE = new ArtifactSearchEngine();
$this->addSearchEngine(
SEARCH__TYPE_IS_ARTIFACT,
- new ArtifactSearchEngine()
+ $artifactSE
);
+ $forumSE = new ForumSearchEngine();
$this->addSearchEngine(
SEARCH__TYPE_IS_FORUM,
- new ForumSearchEngine()
+ $forumSE
);
// Project search engines
+ $groupSE = new GroupSearchEngine(SEARCH__TYPE_IS_FULL_PROJECT,
'FullProjectHtmlSearchRenderer', _('Search the entire project'));
$this->addSearchEngine(
SEARCH__TYPE_IS_FULL_PROJECT,
- new GroupSearchEngine(SEARCH__TYPE_IS_FULL_PROJECT,
'FullProjectHtmlSearchRenderer', _('Search the entire project'))
+ $groupSE
);
+ $groupTrackerSE = new TrackersGroupSearchEngine();
$this->addSearchEngine(
SEARCH__TYPE_IS_TRACKERS,
- new TrackersGroupSearchEngine()
+ $groupTrackerSE
);
+ $groupForumSE = new ForumsGroupSearchEngine();
$this->addSearchEngine(
SEARCH__TYPE_IS_FORUMS,
- new ForumsGroupSearchEngine()
+ $groupForumSE;
);
+ $groupTaskSE = new TasksGroupSearchEngine();
$this->addSearchEngine(
SEARCH__TYPE_IS_TASKS,
- new TasksGroupSearchEngine()
+ $groupTaskSE
);
+ $groupFRSSE = new FrsGroupSearchEngine();
$this->addSearchEngine(
SEARCH__TYPE_IS_FRS,
- new FrsGroupSearchEngine()
+ $groupFRSSE
);
+ $groupDocsSE = new DocsGroupSearchEngine();
$this->addSearchEngine(
SEARCH__TYPE_IS_DOCS,
- new DocsGroupSearchEngine()
+ $groupDocsSE
);
+ $groupNewsSE = new NewsGroupSearchEngine();
$this->addSearchEngine(
SEARCH__TYPE_IS_NEWS,
- new NewsGroupSearchEngine()
+ $groupNewsSE
);
# Hook to be able to load new search engine
plugin_hook_by_reference('group_search_engines', $this);
// Global search engine
+ $ffSESoft = new GFSearchEngine(SEARCH__TYPE_IS_SOFTWARE,
'ProjectHtmlSearchRenderer', _('Projects'));
$this->addSearchEngine(
SEARCH__TYPE_IS_SOFTWARE,
- new GFSearchEngine(SEARCH__TYPE_IS_SOFTWARE,
'ProjectHtmlSearchRenderer', _('Projects'))
+ $gfSESoft
);
+ $ffSEPeople = new GFSearchEngine(SEARCH__TYPE_IS_PEOPLE,
'PeopleHtmlSearchRenderer', _('People'));
$this->addSearchEngine(
SEARCH__TYPE_IS_PEOPLE,
- new GFSearchEngine(SEARCH__TYPE_IS_PEOPLE,
'PeopleHtmlSearchRenderer', _('People'))
+ $ffSEPeople
);
+ $ffSEAllDocs = new GFSearchEngine(SEARCH__TYPE_IS_ALLDOCS,
'DocsAllHtmlSearchRenderer', _('Documents'));
$this->addSearchEngine(
SEARCH__TYPE_IS_ALLDOCS,
- new GFSearchEngine(SEARCH__TYPE_IS_ALLDOCS,
'DocsAllHtmlSearchRenderer', _('Documents'))
+ $ffSEAllDocs
);
+
if (forge_get_config('use_people')) {
+ $ffSESkills = new GFSearchEngine(SEARCH__TYPE_IS_SKILL,
'SkillHtmlSearchRenderer', _('Skills'));
$this->addSearchEngine(
SEARCH__TYPE_IS_SKILL,
- new GFSearchEngine(SEARCH__TYPE_IS_SKILL,
'SkillHtmlSearchRenderer', _('Skills'))
+ $ffSESkills
);
}
// Rss search engines
+ $ffSESoftRss = new GFSearchEngine(SEARCH__TYPE_IS_SOFTWARE,
'ProjectRssSearchRenderer', _('Projects'));
$this->addSearchEngine(
SEARCH__TYPE_IS_SOFTWARE,
- new GFSearchEngine(SEARCH__TYPE_IS_SOFTWARE,
'ProjectRssSearchRenderer', _('Projects')),
+ $ffSESoftRss,
SEARCH__OUTPUT_RSS
);
-----------------------------------------------------------------------
Summary of changes:
src/www/search/include/SearchManager.class.php | 44 ++++++++++++++++++--------
1 file changed, 30 insertions(+), 14 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
