public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 22:35:55 +00:00
Code Issues Releases Wiki Activity

add additional check for sphinxclient class

Browse Source
This commit is contained in:
Andrew Dolgov
2015-04-03 19:53:35 +03:00
parent 27f7b59353
commit 0722e857c0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/search_sphinx/init.php
View File

@@ -11,7 +11,8 @@ class Search_Sphinx extends Plugin {
function init($host) { function init($host) {
$host->add_hook($host::HOOK_SEARCH, $this); $host->add_hook($host::HOOK_SEARCH, $this);
if (class_exists("SphinxClient")) { // idk if that would work but checking for the class being loaded is somehow not enough
if (class_exists("SphinxClient") && !defined('SEARCHD_COMMAND_SEARCH')) {
user_error("Your PHP has a separate systemwide Sphinx client installed which conflicts with the client library used by tt-rss. Either remove the system library or disable Sphinx support."); user_error("Your PHP has a separate systemwide Sphinx client installed which conflicts with the client library used by tt-rss. Either remove the system library or disable Sphinx support.");
} }