[MediaWiki-commits] [Gerrit] mediawiki...SphinxSearch[master]: Fix path error in sphinxapi.php loading

[Notartom (Code Review)]

Notartom has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401112 )

Change subject: Fix path error in sphinxapi.php loading
......................................................................

Fix path error in sphinxapi.php loading

Commit 3837675 introduced falling back on loading sphinxapi.php
from the extension directory if the extension wasn't installed with
composer. However, it missed a necessary / in the path. This patch
fixes this.

Change-Id: I09bec64b1a3cae05982dec9901e8ad719152835d
---
M SphinxSearch.php
1 file changed, 1 insertion(+), 1 deletion(-)


git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SphinxSearch refs/changes/12/401112/1

diff --git a/SphinxSearch.php b/SphinxSearch.php
index 0e812e5..c22796a 100644
--- a/SphinxSearch.php
+++ b/SphinxSearch.php
@@ -50,7 +50,7 @@
# installation folder to your SphinxSearch extension folder
# not needed if you install http://pecl.php.net/package/sphinx
if ( !class_exists( 'SphinxClient' ) ) {
- require_once ( __DIR__. 'sphinxapi.php' );
+ require_once ( __DIR__ . '/sphinxapi.php' );
}

# Host and port on which searchd deamon is running
--
To view, visit https://gerrit.wikimedia.org/r/401112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I09bec64b1a3cae05982dec9901e8ad719152835d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SphinxSearch
Gerrit-Branch: master
Gerrit-Owner: Notartom <***@gmail.com>

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401112 )

Change subject: Fix path error in sphinxapi.php loading
......................................................................


Fix path error in sphinxapi.php loading

Commit 3837675 introduced falling back on loading sphinxapi.php
from the extension directory if the extension wasn't installed with
composer. However, it missed a necessary / in the path. This patch
fixes this.

Change-Id: I09bec64b1a3cae05982dec9901e8ad719152835d
---
M SphinxSearch.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified



diff --git a/SphinxSearch.php b/SphinxSearch.php
index 0e812e5..c22796a 100644
--- a/SphinxSearch.php
+++ b/SphinxSearch.php
@@ -50,7 +50,7 @@
# installation folder to your SphinxSearch extension folder
# not needed if you install http://pecl.php.net/package/sphinx
if ( !class_exists( 'SphinxClient' ) ) {
- require_once ( __DIR__. 'sphinxapi.php' );
+ require_once ( __DIR__ . '/sphinxapi.php' );
}

# Host and port on which searchd deamon is running
--
To view, visit https://gerrit.wikimedia.org/r/401112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I09bec64b1a3cae05982dec9901e8ad719152835d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SphinxSearch
Gerrit-Branch: master
Gerrit-Owner: Notartom <***@gmail.com>
Gerrit-Reviewer: Umherirrender <***@web.de>
Gerrit-Reviewer: jenkins-bot <>