From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 3 Apr 2015 16:53:35 +0000 (+0300)
Subject: add additional check for sphinxclient class
X-Git-Tag: 16.3~331
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=0722e857c08fde082166ff8c339e97f1a0cd1837;p=tt-rss.git

add additional check for sphinxclient class
---

diff --git a/plugins/search_sphinx/init.php b/plugins/search_sphinx/init.php
index 557b2682..065af64f 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.");
 		}