summaryrefslogtreecommitdiff
path: root/plugins/search_sphinx
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2015-04-03 19:53:35 +0300
committerAndrew Dolgov <[email protected]>2015-04-03 19:53:35 +0300
commit0722e857c08fde082166ff8c339e97f1a0cd1837 (patch)
tree10acf65748623c038398ff508d7704b9f33f29e5 /plugins/search_sphinx
parent27f7b59353a076120407d8873ea86f5eea7d1dcf (diff)
add additional check for sphinxclient class
Diffstat (limited to 'plugins/search_sphinx')
-rw-r--r--plugins/search_sphinx/init.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/search_sphinx/init.php b/plugins/search_sphinx/init.php
index 557b2682c..065af64f2 100644
--- a/plugins/search_sphinx/init.php
+++ b/plugins/search_sphinx/init.php
@@ -11,7 +11,8 @@ class Search_Sphinx extends Plugin {
function init($host) {
$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.");
}